TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: git, git-minimal: Do not retain a reference to 'bash-for-tests'.

Browse source 
Fixes <https://bugs.gnu.org/39513>.
Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>.

* gnu/packages/version-control.scm (git, git-minimal)[inputs]: Move BASH ...
[native-inputs]: ... here.  Add BASH-MINIMAL.
This commit is contained in:
Marius Bakke 2020-02-10 23:03:30 +01:00
parent 2073b55e6b
commit 22236ceb64
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/version-control.scm
View file

@ -15,7 +15,7 @@
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 André <eu@euandre.org>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
@ -163,6 +163,10 @@ (define-public git
(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 @@ (define-public git
("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 @@ (define-public git-minimal
`(,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