ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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