guix build: 'options->transformation' no longer takes a 'store' parameter.

* guix/scripts/build.scm (transform-package-source)
(transform-package-inputs, transform-package-inputs/graft)
(transform-package-source-branch, transform-package-source-commit)
(transform-package-source-git-url, transform-package-toolchain)
(transform-package-with-debug-info, transform-package-tests): Remove
'store' parameter.
(options->transformation, options->derivations): Adjust accordingly.
* guix/scripts/environment.scm (options/resolve-packages): Likewise.
* guix/scripts/graph.scm (guix-graph): Likewise.
* guix/scripts/pack.scm (guix-pack): Likewise.
* guix/scripts/package.scm (transaction-upgrade-entry): Likewise.
(process-actions): Likewise.
* tests/scripts-build.scm ("options->transformation, no transformations")
("options->transformation, with-source, replacement"):
Adjust tests.
("options->transformation, with-source")
("options->transformation, with-source, with version")
("options->transformation, with-source, PKG=URI"): Use 'lower-object' to
compute the store file name of the source.
("options->transformation, with-source, no matches"): Remove
'with-store' and adjust accordingly.
("options->transformation, with-input"): Likewise.
("options->transformation, with-graft"): Likewise.
("options->transformation, with-branch"): Likewise.
("options->transformation, with-commit"): Likewise.
("options->transformation, with-git-url"): Likewise.
("options->transformation, with-git-url + with-branch"): Likewise.
("options->transformation, with-c-toolchain"): Likewise.
("options->transformation, with-c-toolchain twice"): Likewise.
("options->transformation, with-c-toolchain, no effect"): Likewise.
("options->transformation, with-debug-info"): Likewise.
("options->transformation, without-tests"): Likewise.

5 files changed, 21 insertions, 22 deletions

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 65a125263d..4b86047587 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -233,7 +233,7 @@ matching URIs given in SOURCES."
                         (string-drop uri (+ 1 index))))))))
          sources))
 
-  (lambda (store obj)
+  (lambda (obj)
     (let loop ((sources  new-sources)
                (result   '()))
       (match obj
@@ -276,7 +276,7 @@ called \"guile\" must be replaced with a dependency on a version 2.1 of
                                                    (lambda (old new)
                                                      new)))
          (rewrite      (package-input-rewriting/spec replacements)))
-    (lambda (store obj)
+    (lambda (obj)
       (if (package? obj)
           (rewrite obj)
           obj))))
@@ -292,7 +292,7 @@ current 'gnutls' package, after which version 3.5.4 is grafted onto them."
   (let* ((replacements (evaluate-replacement-specs replacement-specs
                                                    set-replacement))
          (rewrite      (package-input-rewriting/spec replacements)))
-    (lambda (store obj)
+    (lambda (obj)
       (if (package? obj)
           (rewrite obj)
           obj))))
@@ -349,7 +349,7 @@ strings like \"guile-next=stable-3.0\" meaning that packages are built using
   (let* ((replacements (evaluate-git-replacement-specs replacement-specs
                                                        replace))
          (rewrite      (package-input-rewriting/spec replacements)))
-    (lambda (store obj)
+    (lambda (obj)
       (if (package? obj)
           (rewrite obj)
           obj))))
@@ -377,7 +377,7 @@ strings like \"guile-next=cabba9e\" meaning that packages are built using
   (let* ((replacements (evaluate-git-replacement-specs replacement-specs
                                                        replace))
          (rewrite      (package-input-rewriting/spec replacements)))
-    (lambda (store obj)
+    (lambda (obj)
       (if (package? obj)
           (rewrite obj)
           obj))))
@@ -405,7 +405,7 @@ a checkout of the Git repository at the given URL."
   (define rewrite
     (package-input-rewriting/spec replacements))
 
-  (lambda (store obj)
+  (lambda (obj)
     (if (package? obj)
         (rewrite obj)
         obj)))
@@ -478,7 +478,7 @@ the equal sign."
                      spec))))
          replacement-specs))
 
-  (lambda (store obj)
+  (lambda (obj)
     (if (package? obj)
         (or (any (match-lambda
                    ((bottom . toolchain)
@@ -516,7 +516,7 @@ to the same package but with #:strip-binaries? #f in its 'arguments' field."
                                          (cons spec package-with-debug-info))
                                        specs)))
 
-  (lambda (store obj)
+  (lambda (obj)
     (if (package? obj)
         (rewrite obj)
         obj)))
@@ -535,7 +535,7 @@ to the same package but with #:strip-binaries? #f in its 'arguments' field."
                                          (cons spec package-without-tests))
                                        specs)))
 
-  (lambda (store obj)
+  (lambda (obj)
     (if (package? obj)
         (rewrite obj)
         obj)))
@@ -646,7 +646,7 @@ derivation, etc.), applies the transformations specified by OPTS."
                              applicable))
                     ,@(package-properties p)))))
 
-  (lambda (store obj)
+  (lambda (obj)
     (define (tagged-object new)
       (if (and (not (eq? obj new))
                (package? new) (not (null? applicable)))
@@ -656,7 +656,7 @@ derivation, etc.), applies the transformations specified by OPTS."
     (tagged-object
      (fold (match-lambda*
              (((name value transform) obj)
-              (let ((new (transform store obj)))
+              (let ((new (transform obj)))
                 (when (eq? new obj)
                   (warning (G_ "transformation '~a' had no effect on ~a~%")
                            name
@@ -1113,8 +1113,7 @@ build."
       (systems systems)))
 
   (define things-to-build
-    (map (cut transform store <>)
-         (options->things-to-build opts)))
+    (map transform (options->things-to-build opts)))
 
   (define (compute-derivation obj system)
     ;; Compute the derivation of OBJ for SYSTEM.
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 91ce2af9bb..4db6c5d2d7 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -320,7 +320,7 @@ for the corresponding packages."
                    (manifest-entry-output e2))))
 
   (define transform
-    (cut (options->transformation opts) store <>))
+    (options->transformation opts))
 
   (define* (package->manifest-entry* package #:optional (output "out"))
     (package->manifest-entry (transform package) output))
diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm
index 0d11fc9795..6b2e60d7e2 100644
--- a/guix/scripts/graph.scm
+++ b/guix/scripts/graph.scm
@@ -582,11 +582,11 @@ Emit a representation of the dependency graph of PACKAGE...\n"))
                                       (('argument . (? store-path? item))
                                        item)
                                       (('argument . spec)
-                                       (transform store
-                                                  (specification->package spec)))
+                                       (transform
+                                        (specification->package spec)))
                                       (('expression . exp)
-                                       (transform store
-                                                  (read/eval-package-expression exp)))
+                                       (transform
+                                        (read/eval-package-expression exp)))
                                       (_ #f))
                                     opts)))
         (run-with-store store
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 8e694edbbe..9fe5a24aee 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -1132,9 +1132,9 @@ Create a bundle of PACKAGE.\n"))
     (let* ((transform     (options->transformation opts))
            (packages      (map (match-lambda
                                  (((? package? package) output)
-                                  (list (transform store package) output))
+                                  (list (transform package) output))
                                  ((? package? package)
-                                  (list (transform store package) "out")))
+                                  (list (transform package) "out")))
                                (reverse
                                 (filter-map maybe-package-argument opts))))
            (manifests     (filter-map (match-lambda
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index ba62d98682..5599e26f5d 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -223,7 +223,7 @@ non-zero relevance score."
       (($ <manifest-entry> name version output (? string? path))
        (match (find-best-packages-by-name name #f)
          ((pkg . rest)
-          (let* ((pkg               (transform store pkg))
+          (let* ((pkg               (transform pkg))
                  (candidate-version (package-version pkg)))
             (match (package-superseded pkg)
               ((? package? new)
@@ -871,7 +871,7 @@ processed, #f otherwise."
   (define transform (options->transformation opts))
 
   (define (transform-entry entry)
-    (let ((item (transform store (manifest-entry-item entry))))
+    (let ((item (transform (manifest-entry-item entry))))
       (manifest-entry-with-transformations
        (manifest-entry
          (inherit entry)