[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: git, git-minimal: Do not retain a reference to 'bash-for-tes
From: |
guix-commits |
Subject: |
01/03: gnu: git, git-minimal: Do not retain a reference to 'bash-for-tests'. |
Date: |
Mon, 10 Feb 2020 17:06:15 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 22236ceb648e152651b392337441bba0ab957db6
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Feb 10 23:03:30 2020 +0100
gnu: git, git-minimal: Do not retain a reference to 'bash-for-tests'.
Fixes <https://bugs.gnu.org/39513>.
Reported by Maxim Cournoyer <address@hidden>.
* gnu/packages/version-control.scm (git, git-minimal)[inputs]: Move BASH ...
[native-inputs]: ... here. Add BASH-MINIMAL.
---
gnu/packages/version-control.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ac1d68f..3333cd5 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2017 Vasile Dumitrascu <address@hidden>
;;; Copyright © 2017 Clément Lassieur <address@hidden>
;;; Copyright © 2017 André <address@hidden>
-;;; Copyright © 2017, 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2018, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2017 Stefan Reichör <address@hidden>
;;; Copyright © 2017 Oleg Pykhalov <address@hidden>
;;; Copyright © 2018 Sou Bunnbu <address@hidden>
@@ -163,6 +163,10 @@ as well as the classic centralized workflow.")
(build-system gnu-build-system)
(native-inputs
`(("native-perl" ,perl)
+ ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests,
+ ;; see <https://bugs.gnu.org/39513>.
+ ("bash" ,bash-minimal)
+ ("bash-for-tests" ,bash)
("gettext" ,gettext-minimal)
("git-manpages"
,(origin
@@ -185,10 +189,6 @@ as well as the classic centralized workflow.")
("python" ,python-2) ; CAVEAT: incompatible with python-3 according to
INSTALL
("zlib" ,zlib)
- ;; Note: we keep this in inputs rather than native-inputs to work around
- ;; a problem in 'patch-shebangs'; see <https://bugs.gnu.org/31952>.
- ("bash-for-tests" ,bash)
-
;; For PCRE support in git grep (USE_LIBPCRE2).
("pcre" ,pcre2)
@@ -539,15 +539,16 @@ everything from small to very large projects with speed
and efficiency.")
`(,perl ,@lst))))
(outputs '("out"))
(native-inputs
- `(("native-perl" ,perl)
+ `(("bash" ,bash-minimal)
+ ("bash-for-tests" ,bash)
+ ("native-perl" ,perl)
("gettext" ,gettext-minimal)))
(inputs
`(("curl" ,curl) ;for HTTP(S) access
("expat" ,expat) ;for 'git push' over HTTP(S)
("openssl" ,openssl)
("perl" ,perl)
- ("zlib" ,zlib)
- ("bash-for-tests" ,bash)))))
+ ("zlib" ,zlib)))))
(define-public libgit2
(package