GNU bug report logs - #73073
[PATCH 0/6] Allow origin with label as inputs.

Previous Next

Full log

Message #118 received at 73073 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 73073 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>,
 Simon Tournier <zimon.toutoune <at> gmail.com>
Subject: [PATCH v3 8/8] gnu: cgit: Remove input labels.
Date: Wed,  4 Dec 2024 18:54:29 +0100

From: Simon Tournier <zimon.toutoune <at> gmail.com>

* gnu/packages/version-control.scm (cgit)
[inputs]: Remove labels.
[arguments]<phases>: Adjust.

Change-Id: Iff479fa636f7a4c4fef5137ae22934d4e213223b
Co-authored-by: Ludovic Courtès <ludo <at> gnu.org>
---
 gnu/packages/version-control.scm | 49 ++++++++++++++++----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 16e498b307..77b0a62458 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1378,7 +1378,7 @@ (define-public cgit
               (lambda* (#:key inputs #:allow-other-keys)
                 ;; Unpack the source of git into the 'git' directory.
                 (invoke "tar" "--strip-components=1" "-C" "git" "-xf"
-                        (assoc-ref inputs "git-source"))))
+                        #$(this-package-input "git-source.tar.xz"))))
             (add-after 'unpack 'patch-absolute-file-names
               (lambda* (#:key inputs outputs #:allow-other-keys)
                 (define (quoted-file-name input path)
@@ -1433,29 +1433,30 @@ (define-public cgit
        ;; For building manpage.
        (list asciidoc))
       (inputs
-       `( ;; Building cgit requires a Git source tree.
-         ("git-source"
-          ,(origin
-             (method url-fetch)
-             ;; cgit is tightly bound to git.  Use GIT_VER from the Makefile,
-             ;; which may not match the current (package-version git).
-             (uri "mirror://kernel.org/software/scm/git/git-2.46.2.tar.xz")
-             (sha256
-              (base32 "18rcmvximgyg3v1a9papi9djfamiak0ys5cmgx7ll29nhp3a3s2y"))))
-         ("bash-minimal" ,bash-minimal)
-         ("openssl" ,openssl)
-         ("python" ,python)
-         ("python-docutils" ,python-docutils)
-         ("python-markdown" ,python-markdown)
-         ("python-pygments" ,python-pygments)
-         ("zlib" ,zlib)
-         ;; bzip2, groff, gzip and xz are inputs (not native inputs)
-         ;; since they are actually substituted into cgit source and
-         ;; referenced by the built package output.
-         ("bzip2" ,bzip2)
-         ("groff" ,groff)
-         ("gzip" ,gzip)
-         ("xz" ,xz)))
+       (list (origin
+               (method url-fetch)
+               ;; Building cgit requires a Git source tree.
+               ;; cgit is tightly bound to git.  Use GIT_VER from the Makefile,
+               ;; which may not match the current (package-version git).
+               (uri "mirror://kernel.org/software/scm/git/git-2.46.2.tar.xz")
+               (sha256
+                (base32
+                 "18rcmvximgyg3v1a9papi9djfamiak0ys5cmgx7ll29nhp3a3s2y"))
+               (file-name "git-source.tar.xz"))
+             bash-minimal
+             openssl
+             python
+             python-docutils
+             python-markdown
+             python-pygments
+             zlib
+             ;; bzip2, groff, gzip and xz are inputs (not native inputs)
+             ;; since they are actually substituted into cgit source and
+             ;; referenced by the built package output.
+             bzip2
+             groff
+             gzip
+             xz))
       (home-page "https://git.zx2c4.com/cgit/")
       (synopsis "Web frontend for git repositories")
       (description
-- 
2.46.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.