nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: git: Adjust to new handling of propagated inputs. 

This is a followup to 161094c, which gets rid of the "a/b" notation for
propagated inputs.

* gnu/packages/version-control.scm (package-transitive-propagated-labels*):
  Do not prepend the package name to its input label.
  (package-propagated-input-refs): Delete duplicate labels.
  (git)[arguments]: Adjust wrapping of git-send-email accordingly.
This commit is contained in:
Eric Bavier 2015-07-16 16:39:45 -05:00
parent e4d801623e
commit 355e53c4ca
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/version-control.scm
View File

@ -104,7 +104,7 @@ as well as the classic centralized workflow.")
`(,name
,@(map (match-lambda
((label (? package? _) . _)
(string-append name "/" label)))
label))
(package-transitive-propagated-inputs package)))))
(define (package-propagated-input-refs inputs packages)
@ -112,8 +112,9 @@ as well as the classic centralized workflow.")
PACKAGES and their propagated inputs."
(map (lambda (l)
`(assoc-ref ,inputs ,l))
(append-map package-transitive-propagated-labels*
packages)))
(delete-duplicates ;XXX: efficiency
(append-map package-transitive-propagated-labels*
packages))))
(define-public git
;; Keep in sync with 'git-manpages'!
@ -236,13 +237,12 @@ PACKAGES and their propagated inputs."
(wrap-program git-se*
`("PERL5LIB" ":" prefix
,(map (lambda (o) (string-append o "/lib/perl5/site_perl"))
(delete-duplicates
(list
,@(package-propagated-input-refs
'inputs
`(,perl-authen-sasl
,perl-net-smtp-ssl
,perl-io-socket-ssl)))))))
(list
,@(package-propagated-input-refs
'inputs
(list perl-authen-sasl
perl-net-smtp-ssl
perl-io-socket-ssl))))))
;; Tell 'git-submodule' where Perl is.
(wrap-program git-sm