diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
| commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
| tree | ce883cac0d602b10b7c005755d035a08197e73a9 /guix/scripts/package.scm | |
| parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
| parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'guix/scripts/package.scm')
| -rw-r--r-- | guix/scripts/package.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 2f04652634..eb2e67a0de 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -41,6 +41,7 @@ #:use-module (guix config) #:use-module (guix scripts) #:use-module (guix scripts build) + #:use-module (guix transformations) #:use-module (guix describe) #:autoload (guix store roots) (gc-roots user-owned?) #:use-module ((guix build utils) @@ -223,7 +224,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) @@ -397,8 +398,6 @@ Install, remove, or upgrade packages in a single transaction.\n")) (newline) (show-build-options-help) (newline) - (show-transformation-options-help) - (newline) (display (G_ " -h, --help display this help and exit")) (display (G_ " @@ -873,7 +872,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) |