me
/
guix
Archived
1
0
Fork 0

build-system: Always pass #:graft? #f to 'gexp->derivation'.

Fixes <https://issues.guix.gnu.org/60947>.

Fixes a bug whereby packages referred via 'ungexp' in package arguments
would be "double-grafted": 'gexp->derivation' would first replace those
references by references to the grafted package, only to repeat the
grafting process on the result.

Build systems such as 'gnu', 'cmake', and 'pyproject' were already doing
this.  Only the rest of them is affected.

* guix/build-system/cargo.scm (cargo-build): Pass #:graft? #f to
'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/guile.scm (guile-build): Likewise.
(guile-cross-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/waf.scm (waf-build): Likewise.
master
Ludovic Courtès 2023-01-30 16:57:18 +01:00
parent 7c798cd9e4
commit 25947bbc32
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
10 changed files with 11 additions and 0 deletions

View File

@ -123,6 +123,7 @@ to NAME and VERSION."
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:guile-for-build guile)) #:guile-for-build guile))
(define (package-cargo-inputs p) (define (package-cargo-inputs p)

View File

@ -132,6 +132,7 @@
#:system system #:system system
#:target #f #:target #f
#:substitutable? substitutable? #:substitutable? substitutable?
#:graft? #f
#:guile-for-build guile))) #:guile-for-build guile)))
(define copy-build-system (define copy-build-system

View File

@ -157,6 +157,7 @@ provides a 'setup.ml' file as its build system."
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:guile-for-build guile)) #:guile-for-build guile))
(define dune-build-system (define dune-build-system

View File

@ -112,6 +112,7 @@
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:guile-for-build guile))) #:guile-for-build guile)))
(define font-build-system (define font-build-system

View File

@ -114,6 +114,7 @@
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:guile-for-build guile))) #:guile-for-build guile)))
(define* (guile-cross-build name (define* (guile-cross-build name
@ -170,6 +171,7 @@
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target target #:target target
#:graft? #f
#:guile-for-build guile))) #:guile-for-build guile)))
(define guile-build-system (define guile-build-system

View File

@ -310,6 +310,7 @@ provides a 'setup.ml' file as its build system."
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:guile-for-build guile)) #:guile-for-build guile))
(define ocaml-build-system (define ocaml-build-system

View File

@ -114,6 +114,7 @@ NAME and VERSION."
(gexp->derivation name build (gexp->derivation name build
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:modules imported-modules #:modules imported-modules
#:guile-for-build guile))) #:guile-for-build guile)))

View File

@ -121,6 +121,7 @@ provides a 'SConstruct' file as its build system."
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:guile-for-build guile)) #:guile-for-build guile))
(define scons-build-system (define scons-build-system

View File

@ -182,6 +182,7 @@ level package ID."
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:substitutable? substitutable? #:substitutable? substitutable?
#:guile-for-build guile))) #:guile-for-build guile)))

View File

@ -111,6 +111,7 @@ as its build system."
(gexp->derivation name build (gexp->derivation name build
#:system system #:system system
#:target #f #:target #f
#:graft? #f
#:modules imported-modules #:modules imported-modules
#:guile-for-build guile))) #:guile-for-build guile)))