From 1aa46a7e29c5bd892219fe20fefb883d2103e29e Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 2 Sep 2022 14:33:01 -0400 Subject: gnu: gitolite: Wrap programs instead of using propagated inputs. * gnu/packages/version-control.scm (gitolite)[arguments]: Add git to wrapped $PATH and additionally wrap gitolite-shell. [inputs]: Add git and openssh. [propagated-inputs]: Remove it. --- gnu/packages/version-control.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 15a9278fe8..a7989da200 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1573,17 +1573,15 @@ (define-public gitolite (coreutils (assoc-ref inputs "coreutils")) (findutils (assoc-ref inputs "findutils")) (git (assoc-ref inputs "git"))) - (wrap-program (string-append out "/bin/gitolite") - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list out coreutils findutils git)))))))))) + (for-each (lambda (file-name) + (wrap-program (string-append out file-name) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list out coreutils findutils git))))) + '("/bin/gitolite" "/bin/gitolite-shell")))))))) (inputs - (list bash-minimal perl coreutils findutils inetutils)) - ;; git and openssh are propagated because trying to patch the source via - ;; regexp matching is too brittle and prone to false positives. - (propagated-inputs - (list git openssh)) + (list bash-minimal coreutils findutils git inetutils openssh perl)) (home-page "https://gitolite.com") (synopsis "Git access control layer") (description -- cgit v1.2.3 From e4ccfcb22ad96e71ca4dfad95af5aa6229ed9869 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 4 Sep 2022 09:24:22 -0400 Subject: gnu: gitolite: Switch to git-minimal to reduce closure size. * gnu/packages/version-control.scm (gitolite)[inputs]: Swap 'git' for 'git-minimal'. [arguments]: Refer to 'git-minimal' input instead of 'git'. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a7989da200..7efca514e4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1572,7 +1572,7 @@ (define-public gitolite (let ((out (assoc-ref outputs "out")) (coreutils (assoc-ref inputs "coreutils")) (findutils (assoc-ref inputs "findutils")) - (git (assoc-ref inputs "git"))) + (git (assoc-ref inputs "git-minimal"))) (for-each (lambda (file-name) (wrap-program (string-append out file-name) `("PATH" ":" prefix @@ -1581,7 +1581,7 @@ (define-public gitolite (list out coreutils findutils git))))) '("/bin/gitolite" "/bin/gitolite-shell")))))))) (inputs - (list bash-minimal coreutils findutils git inetutils openssh perl)) + (list bash-minimal coreutils findutils git-minimal inetutils openssh perl)) (home-page "https://gitolite.com") (synopsis "Git access control layer") (description -- cgit v1.2.3 From c4504dfb1da78f2f21fc5139a2fd5e82ed0ef21c Mon Sep 17 00:00:00 2001 From: David Thompson Date: Mon, 5 Sep 2022 14:00:30 -0400 Subject: Revert "gnu: gitolite: Switch to git-minimal to reduce closure size." This reverts commit e4ccfcb22ad96e71ca4dfad95af5aa6229ed9869. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7efca514e4..a7989da200 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1572,7 +1572,7 @@ (define-public gitolite (let ((out (assoc-ref outputs "out")) (coreutils (assoc-ref inputs "coreutils")) (findutils (assoc-ref inputs "findutils")) - (git (assoc-ref inputs "git-minimal"))) + (git (assoc-ref inputs "git"))) (for-each (lambda (file-name) (wrap-program (string-append out file-name) `("PATH" ":" prefix @@ -1581,7 +1581,7 @@ (define-public gitolite (list out coreutils findutils git))))) '("/bin/gitolite" "/bin/gitolite-shell")))))))) (inputs - (list bash-minimal coreutils findutils git-minimal inetutils openssh perl)) + (list bash-minimal coreutils findutils git inetutils openssh perl)) (home-page "https://gitolite.com") (synopsis "Git access control layer") (description -- cgit v1.2.3 From 7cee68e341c3485e13face33a5036342cbd78651 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 31 Aug 2022 19:34:48 +0000 Subject: gnu: git: Update to 2.37.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git): Update to 2.37.3. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a7989da200..1d03da6c13 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -221,14 +221,14 @@ (define git-cross-configure-flags (define-public git (package (name "git") - (version "2.37.2") + (version "2.37.3") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "00xhdm086bxm4v2p8m7ra7vf9kwdppw4l2n3vakfff253j19qg8w")))) + "0yp8hdj0w18jhmmdflzz74z418cw95i08pc22yycyn8nyvbl2il1")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -248,7 +248,7 @@ (define-public git version ".tar.xz")) (sha256 (base32 - "1zhn91fzyyz890a5hm0bvs0vnhy8c81q1fhsk2gfwbbh73z161nz")))) + "053lj9wy8y2yr5jzpb0af4w50gz3ckhgc15wqx7is4z6k9a76lww")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From d675a28c026aa345d0a914ba1320d7d01cd838b6 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 31 Aug 2022 19:34:49 +0000 Subject: gnu: src: Update to 1.29. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (src): Update to 1.29. [inputs]: Add cssc. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1d03da6c13..08bd80b586 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2847,14 +2847,14 @@ (define-public gource (define-public src (package (name "src") - (version "1.18") + (version "1.29") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/src/src-" version ".tar.gz")) (sha256 (base32 - "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c")))) + "0ha287gc95vz6bdvn42pi3qibc56h1w5dshsvjvdn2zd283amksd")))) (build-system gnu-build-system) (arguments '(#:make-flags @@ -2880,7 +2880,8 @@ (define-public src ;; For testing. (list git perl)) (inputs - `(("python" ,python-wrapper) + `(("cssc" ,cssc) + ("python" ,python-wrapper) ("rcs" ,rcs))) (synopsis "Simple revision control") (home-page "http://www.catb.org/~esr/src/") -- cgit v1.2.3