[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: build-system: Always pass #:graft? #f to 'gexp->d
|
From: |
guix-commits |
|
Subject: |
branch master updated: build-system: Always pass #:graft? #f to 'gexp->derivation'. |
|
Date: |
Fri, 03 Feb 2023 10:27:24 -0500 |
This is an automated email from the git hooks/post-receive script.
civodul pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 25947bbc32 build-system: Always pass #:graft? #f to 'gexp->derivation'.
25947bbc32 is described below
commit 25947bbc3217306742694304fa9b6499f0126c7a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jan 30 16:57:18 2023 +0100
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.
---
guix/build-system/cargo.scm | 1 +
guix/build-system/copy.scm | 1 +
guix/build-system/dune.scm | 1 +
guix/build-system/font.scm | 1 +
guix/build-system/guile.scm | 2 ++
guix/build-system/ocaml.scm | 1 +
guix/build-system/ruby.scm | 1 +
guix/build-system/scons.scm | 1 +
guix/build-system/texlive.scm | 1 +
guix/build-system/waf.scm | 1 +
10 files changed, 11 insertions(+)
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 60c35eed07..912400a191 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -123,6 +123,7 @@ to NAME and VERSION."
(gexp->derivation name builder
#:system system
#:target #f
+ #:graft? #f
#:guile-for-build guile))
(define (package-cargo-inputs p)
diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm
index c98b266561..6efc2b2766 100644
--- a/guix/build-system/copy.scm
+++ b/guix/build-system/copy.scm
@@ -132,6 +132,7 @@
#:system system
#:target #f
#:substitutable? substitutable?
+ #:graft? #f
#:guile-for-build guile)))
(define copy-build-system
diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm
index 12100fd8e8..3f81d21441 100644
--- a/guix/build-system/dune.scm
+++ b/guix/build-system/dune.scm
@@ -157,6 +157,7 @@ provides a 'setup.ml' file as its build system."
(gexp->derivation name builder
#:system system
#:target #f
+ #:graft? #f
#:guile-for-build guile))
(define dune-build-system
diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm
index 74dc80b5db..a99f76c66b 100644
--- a/guix/build-system/font.scm
+++ b/guix/build-system/font.scm
@@ -112,6 +112,7 @@
(gexp->derivation name builder
#:system system
#:target #f
+ #:graft? #f
#:guile-for-build guile)))
(define font-build-system
diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm
index 36a88e181a..ffc892260a 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -114,6 +114,7 @@
(gexp->derivation name builder
#:system system
#:target #f
+ #:graft? #f
#:guile-for-build guile)))
(define* (guile-cross-build name
@@ -170,6 +171,7 @@
(gexp->derivation name builder
#:system system
#:target target
+ #:graft? #f
#:guile-for-build guile)))
(define guile-build-system
diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index b08985cd4d..921c1f8629 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -310,6 +310,7 @@ provides a 'setup.ml' file as its build system."
(gexp->derivation name builder
#:system system
#:target #f
+ #:graft? #f
#:guile-for-build guile))
(define ocaml-build-system
diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm
index 342daf7978..0aa273b4f4 100644
--- a/guix/build-system/ruby.scm
+++ b/guix/build-system/ruby.scm
@@ -114,6 +114,7 @@ NAME and VERSION."
(gexp->derivation name build
#:system system
#:target #f
+ #:graft? #f
#:modules imported-modules
#:guile-for-build guile)))
diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm
index 7a02fa8a0f..9af24d40f8 100644
--- a/guix/build-system/scons.scm
+++ b/guix/build-system/scons.scm
@@ -121,6 +121,7 @@ provides a 'SConstruct' file as its build system."
(gexp->derivation name builder
#:system system
#:target #f
+ #:graft? #f
#:guile-for-build guile))
(define scons-build-system
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index dbb72cd24a..336e192d83 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -182,6 +182,7 @@ level package ID."
(gexp->derivation name builder
#:system system
#:target #f
+ #:graft? #f
#:substitutable? substitutable?
#:guile-for-build guile)))
diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm
index e8cd5520b8..1d520050f6 100644
--- a/guix/build-system/waf.scm
+++ b/guix/build-system/waf.scm
@@ -111,6 +111,7 @@ as its build system."
(gexp->derivation name build
#:system system
#:target #f
+ #:graft? #f
#:modules imported-modules
#:guile-for-build guile)))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: build-system: Always pass #:graft? #f to 'gexp->derivation'.,
guix-commits <=