From 3806c39c91c5a04c185ec11ac659d4b57cd072c6 Mon Sep 17 00:00:00 2001 From: Javier Olaechea Date: Fri, 8 Nov 2024 18:51:09 -0500 Subject: gnu: entr: Improve package style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/entr.scm (entr): Improve package style. The changes are the result of running ./pre-inst-env guix style entr. Change-Id: I9579e326f88c6066078f2df78a12431f3f4badd4 Signed-off-by: Ludovic Courtès --- gnu/packages/entr.scm | 57 ++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm index bb09acd6aa..f84a217814 100644 --- a/gnu/packages/entr.scm +++ b/gnu/packages/entr.scm @@ -37,37 +37,38 @@ (package (name "entr") (version "5.6") - (source (origin - (method url-fetch) - (uri (string-append "https://eradman.com/entrproject/code/entr-" - version ".tar.gz")) - (sha256 - (base32 - "0kniklgnqv4j9carm78d3423wlwqw1ykxmlla4xmlfwdjbgvh8h2")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://eradman.com/entrproject/code/entr-" + version ".tar.gz")) + (sha256 + (base32 "0kniklgnqv4j9carm78d3423wlwqw1ykxmlla4xmlfwdjbgvh8h2")))) (build-system gnu-build-system) (arguments `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (setenv "CC" ,(cc-for-target)) - (setenv "PREFIX" out) - (setenv "MANPREFIX" (string-append out "/man")) - (invoke "./configure")))) - (add-before 'build 'remove-fhs-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "entr.c" - (("/bin/sh" command) - (search-input-file inputs command)) - (("/bin/cat" command) - (search-input-file inputs command)) - (("/usr(/bin/clear)" _ command) - (search-input-file inputs command)))))))) - (inputs - (list bash coreutils ncurses)) + #:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" + (which "bash")) + (setenv "CC" + ,(cc-for-target)) + (setenv "PREFIX" out) + (setenv "MANPREFIX" + (string-append out "/man")) + (invoke "./configure")))) + (add-before 'build 'remove-fhs-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "entr.c" + (("/bin/sh" command) + (search-input-file inputs command)) + (("/bin/cat" command) + (search-input-file inputs command)) + (("/usr(/bin/clear)" _ command) + (search-input-file inputs command)))))))) + (inputs (list bash coreutils ncurses)) (home-page "https://eradman.com/entrproject/") (synopsis "Run arbitrary commands when files change") (description -- cgit v1.2.3 '>2024-11-02gnu: mpd-mpc: Update to 0.35....* gnu/packages/mpd.scm (mpd-mpc): Update to 0.35. Change-Id: I72237f9fd0e9a8549ba316ae2cb65ed60f4f02c7 Ian Eure 2024-08-31gnu: mpd: Add 'bash' input for 'wrap-program'....It is required for cross-compilation. * gnu/packages/mpd.scm (sonata)[native-inputs]: Remove labels. [inputs]: Add 'bash-minimal'. (mcg)[inputs]: Likewise. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I46f0f5f57a6053c7b03f0a3830df3b8bc752f361 Maxime Devos 2024-08-31build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-mod......Until now users would have to cargo cult or inspect the private %default-modules variable of (guix build-systems gnu) to discover which modules to include when extending the used modules via the #:modules argument. The renaming was automated via the command: $ git grep -l %gnu-build-system-modules | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i * guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to... (%default-gnu-imported-modules): ... this. (%default-modules): Rename to... (%default-gnu-modules): ... this. Export. (dist-package, gnu-build, gnu-cross-build): Adjust accordingly. Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee Maxim Cournoyer 2024-04-03gnu: sonata: Add gvfs as an input....I'm getting the following error and this change resolves it: /gnu/store/rw6n86c008xqdbjs3nk4i7ggf6srdpgs-python-wrapper-3.10.7/bin/python: symbol lookup error: /run/current-system/profile/lib/gio/modules/libgvfsdbus.so: undefined symbol: g_task_set_static_name Change-Id: I6f74a5a867ba7c3b3d7b233916af0e75d9e5501f Signed-off-by: Christopher Baines <mail@cbaines.net> Christopher Baines