From 320dd53ea6a0e81a8404238b2b73bd9f02caad2b Mon Sep 17 00:00:00 2001 Message-ID: <320dd53ea6a0e81a8404238b2b73bd9f02caad2b.1701526695.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Sat, 2 Dec 2023 17:18:12 +0300 Subject: [PATCH] gnu: guile-gitlab: Improve the package style. * gnu/packages/guile-xyz.scm (guile-gitlab): Improve the package style. [inputs]: Remove input labels. Change-Id: I449a02e1f9d700f678bb09961b896dea1627632e --- gnu/packages/guile-xyz.scm | 64 +++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b3ac661e77..f46246f1c6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5408,49 +5408,41 @@ (define-public guile-gitlab (commit (string-append "v" version)))) (file-name (string-append name "-" version)) (sha256 - (base32 - "0srkmchd4kmfa7q65r6fdzwklhgdlck1ll0s7smzs8ddjdgz2lwm")))) + (base32 "0srkmchd4kmfa7q65r6fdzwklhgdlck1ll0s7smzs8ddjdgz2lwm")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) ,@%gnu-build-system-modules) #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (guile-lib (assoc-ref inputs "guile-lib")) - (json (assoc-ref inputs "guile-json")) - (tls (assoc-ref inputs "guile-gnutls")) - (version (target-guile-effective-version)) - (scm (string-append "/share/guile/site/" - version)) - (go (string-append "/lib/guile/" - version "/site-ccache"))) - (wrap-program (string-append bin "/gitlab-cli") - `("GUILE_LOAD_PATH" prefix - (,(string-append out scm) - ,(string-append guile-lib scm) - ,(string-append json scm) - ,(string-append tls scm))) - `("GUILE_LOAD_COMPILED_PATH" prefix - (,(string-append out go) - ,(string-append guile-lib go) - ,(string-append json go) - ,(string-append tls go)))))))))) - (native-inputs - (list autoconf automake pkg-config texinfo)) - (inputs - `(("bash" ,bash-minimal) - ("guile" ,guile-2.2) - ("guile-json" ,guile2.2-json) - ("guile-lib" ,guile2.2-lib) - ("guile-gnutls" ,guile2.2-gnutls))) + #:phases (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile-lib (assoc-ref inputs "guile2.2-lib")) + (json (assoc-ref inputs "guile2.2-json")) + (tls (assoc-ref inputs "guile2.2-gnutls")) + (version (target-guile-effective-version)) + (scm (string-append "/share/guile/site/" version)) + (go (string-append "/lib/guile/" version + "/site-ccache"))) + (wrap-program (string-append bin "/gitlab-cli") + `("GUILE_LOAD_PATH" prefix + (,(string-append out scm) ,(string-append + guile-lib scm) + ,(string-append json scm) + ,(string-append tls scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out go) ,(string-append guile-lib + go) + ,(string-append json go) + ,(string-append tls go)))))))))) + (native-inputs (list autoconf automake pkg-config texinfo)) + (inputs (list bash-minimal guile-2.2 guile2.2-json guile2.2-lib + guile2.2-gnutls)) (home-page "https://github.com/artyom-poptsov/guile-gitlab") (synopsis "Guile interface to GitLab") (description base-commit: aeb494322ca9dec4a4d66a7d063239c8536bd538 -- 2.41.0