ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
guix/build-system/cargo.scm
View file

@ -123,6 +123,7 @@ (define builder
(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)

1
guix/build-system/copy.scm
View file

@ -132,6 +132,7 @@ (define builder
#: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

1
guix/build-system/dune.scm
View file

@ -157,6 +157,7 @@ (define builder
(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

1
guix/build-system/font.scm
View file

@ -112,6 +112,7 @@ (define builder
(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

2
guix/build-system/guile.scm
View file

@ -114,6 +114,7 @@ (define builder
(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 @@ (define %outputs
(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

1
guix/build-system/ocaml.scm
View file

@ -310,6 +310,7 @@ (define builder
(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

1
guix/build-system/ruby.scm
View file

@ -114,6 +114,7 @@ (define build
(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)))

1
guix/build-system/scons.scm
View file

@ -121,6 +121,7 @@ (define builder
(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

1
guix/build-system/texlive.scm
View file

@ -182,6 +182,7 @@ (define builder
(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)))

1
guix/build-system/waf.scm
View file

@ -111,6 +111,7 @@ (define build
(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)))