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

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

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

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

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

17
guix/packages.scm
View File

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