ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages: Adjust to new calling convention for "thunked" fields.

Browse source 
Fixes <https://bugs.gnu.org/34995>.

This is a followup to abd4d6b33d.

* guix/packages.scm (package->bag): Adjust calls to INPUTS,
PROPAGATED-INPUTS, NATIVE-INPUTS, and ARGS, passing them SELF as an
argument.
* gnu/packages/gnucash.scm (gnucash)[arguments]: Use (package-inputs
this-record) intead of (inputs).
* gnu/packages/version-control.scm (git)[arguments]: Likewise.
This commit is contained in:
Ludovic Courtès 2019-03-26 10:22:15 +01:00
parent 6c177f6140
commit e6301fb76d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/gnucash.scm
View file

@ -27,6 +27,7 @@ (define-module (gnu packages gnucash)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module ((guix records) #:select (this-record))
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
@ -165,14 +166,14 @@ (define-public gnucash
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (inputs))) (assoc l (package-inputs this-record)))
'("perl-finance-quote" '("perl-finance-quote"
"perl-date-manip")))) "perl-date-manip"))))
(list (list
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (inputs))) (assoc l (package-inputs this-record)))
'("perl-finance-quote"))))))))) '("perl-finance-quote")))))))))
'("gnucash" '("gnucash"
"gnc-fq-check" "gnc-fq-check"

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

@ -51,6 +51,7 @@ (define-module (gnu packages version-control)
#:use-module (guix build-system haskell) #:use-module (guix build-system haskell)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module ((guix records) #:select (this-record))
#:use-module (gnu packages apr) #:use-module (gnu packages apr)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
@ -408,7 +409,7 @@ (define-public git
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (inputs))) (assoc l (package-inputs this-record)))
'("perl-authen-sasl" '("perl-authen-sasl"
"perl-net-smtp-ssl" "perl-net-smtp-ssl"
"perl-io-socket-ssl"))))))) "perl-io-socket-ssl")))))))
@ -421,7 +422,7 @@ (define-public git
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (inputs))) (assoc l (package-inputs this-record)))
'("perl-cgi"))))))) '("perl-cgi")))))))
;; Tell 'git-submodule' where Perl is. ;; Tell 'git-submodule' where Perl is.

17
guix/packages.scm
View file

@ -1025,9 +1025,10 @@ (define* (package->bag package #:optional
(match (if graft? (match (if graft?
(or (package-replacement package) package) (or (package-replacement package) package)
package) package)
(($ <package> name version source build-system ((and self
args inputs propagated-inputs native-inputs ($ <package> name version source build-system
self-native-input? outputs) args inputs propagated-inputs native-inputs
self-native-input? outputs))
;; Even though we prefer to use "@" to separate the package ;; Even though we prefer to use "@" to separate the package
;; name from the package version in various user-facing parts ;; name from the package version in various user-facing parts
;; of Guix, checkStoreName (in nix/libstore/store-api.cc) ;; of Guix, checkStoreName (in nix/libstore/store-api.cc)
@ -1036,15 +1037,15 @@ (define* (package->bag package #:optional
#:system system #:system system
#:target target #:target target
#:source source #:source source
#:inputs (append (inputs) #:inputs (append (inputs self)
(propagated-inputs)) (propagated-inputs self))
#:outputs outputs #:outputs outputs
#:native-inputs `(,@(if (and target #:native-inputs `(,@(if (and target
self-native-input?) self-native-input?)
`(("self" ,package)) `(("self" ,self))
'()) '())
,@(native-inputs)) ,@(native-inputs self))
#:arguments (args)) #:arguments (args self))
(raise (if target (raise (if target
(condition (condition
(&package-cross-build-system-error (&package-cross-build-system-error