diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-03-04 10:57:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-03-05 12:49:27 +0100 |
| commit | 90ea8b16eb519a88d8f739fea5a416c0b99de19f (patch) | |
| tree | bc14a6d8b838ed86f173dd5d47abe43994cfda66 /guix/profiles.scm | |
| parent | c9d42d611c43e485fe39ef0adc2b032a4aec8fae (diff) | |
| download | guix-90ea8b16eb519a88d8f739fea5a416c0b99de19f.tar.gz guix-90ea8b16eb519a88d8f739fea5a416c0b99de19f.tar.xz | |
profiles: 'package->manifest-entry' preserves transformations by default.
Previously, transformations applied from a manifest (rather than via
"guix install") would be lost. This change fixes that and simplifies
things.
Reported by zimoun at
<https://lists.gnu.org/archive/html/guix-devel/2021-02/msg00153.html>.
* guix/profiles.scm (default-properties): New procedure.
(package->manifest-entry): Use it for #:properties.
* guix/scripts/pack.scm (guix-pack)[with-transformations]: Remove.
Remove caller.
* guix/scripts/package.scm (transaction-upgrade-entry): Remove calls to
'manifest-entry-with-transformations'.
* tests/guix-package.sh: Add test.
* tests/transformations.scm ("options->transformation + package->manifest-entry"):
New test.
Diffstat (limited to 'guix/profiles.scm')
| -rw-r--r-- | guix/profiles.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index ea8bc6e593..67d90532c1 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -362,9 +362,16 @@ file name." #t lst))) +(define (default-properties package) + "Return the default properties of a manifest entry for PACKAGE." + ;; Preserve transformation options by default. + (match (assq-ref (package-properties package) 'transformations) + (#f '()) + (transformations `((transformations . ,transformations))))) + (define* (package->manifest-entry package #:optional (output "out") #:key (parent (delay #f)) - (properties '())) + (properties (default-properties package))) "Return a manifest entry for the OUTPUT of package PACKAGE." ;; For each dependency, keep a promise pointing to its "parent" entry. (letrec* ((deps (map (match-lambda |