[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/11: '--dry-run' no longer implies '--no-grafts'.
|
From: |
guix-commits |
|
Subject: |
07/11: '--dry-run' no longer implies '--no-grafts'. |
|
Date: |
Sun, 29 Mar 2020 09:37:08 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 131f50cdc9dbb7183023f4dae759876a9e700bef
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed Mar 25 15:05:15 2020 +0100
'--dry-run' no longer implies '--no-grafts'.
* guix/scripts/archive.scm (%options): "dry-run" option no longer adds
'graft? #f to RESULT.
* guix/scripts/environment.scm (%options): Likewise.
* guix/scripts/pack.scm (%options): Likewise.
* guix/scripts/package.scm (%options): Likewise.
* guix/scripts/pull.scm (%options): Likewise.
* guix/scripts/system.scm (%options): Likewise.
---
guix/scripts/archive.scm | 2 +-
guix/scripts/build.scm | 2 +-
guix/scripts/copy.scm | 2 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/pack.scm | 2 +-
guix/scripts/package.scm | 3 +--
guix/scripts/pull.scm | 2 +-
guix/scripts/system.scm | 2 +-
8 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 80f3b70..41a2a42 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -183,7 +183,7 @@ Export/import one or more packages from/to the store.\n"))
(alist-delete 'verbosity result)))))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
- (alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
+ (alist-cons 'dry-run? #t result)))
%standard-build-options))
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 9f87feb..79bd84a 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -778,7 +778,7 @@ must be one of 'package', 'all', or 'transitive'~%")
(alist-cons 'manifest arg result)))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
- (alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
+ (alist-cons 'dry-run? #t result)))
(option '(#\r "root") #t #f
(lambda (opt name arg result)
(alist-cons 'gc-root arg result)))
diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm
index 2fa31ec..f6f64d0 100644
--- a/guix/scripts/copy.scm
+++ b/guix/scripts/copy.scm
@@ -135,7 +135,7 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(alist-delete 'verbosity result)))))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
- (alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
+ (alist-cons 'dry-run? #t result)))
(option '(#\h "help") #f #f
(lambda args
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index ca12346..bfc4039 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -256,7 +256,7 @@ use '--preserve' instead~%"))
(alist-cons 'ad-hoc? #t result)))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
- (alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
+ (alist-cons 'dry-run? #t result)))
(option '(#\s "system") #t #f
(lambda (opt name arg result)
(alist-cons 'system arg
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index b6fb738..f641f53 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -823,7 +823,7 @@ last resort for relocation."
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
- (alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
+ (alist-cons 'dry-run? #t result)))
(option '(#\d "derivation") #f #f
(lambda (opt name arg result)
(alist-cons 'derivation-only? #t result)))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 110d4f2..c7908ec 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -489,8 +489,7 @@ kind of search path~%")
#f)))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result arg-handler)
- (values (alist-cons 'dry-run? #t
- (alist-cons 'graft? #f result))
+ (values (alist-cons 'dry-run? #t result)
#f)))
(option '(#\v "verbosity") #t #f
(lambda (opt name arg result arg-handler)
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index b7e0a4a..42c9956 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -168,7 +168,7 @@ Download and deploy the latest version of Guix.\n"))
(alist-delete 'system result eq?))))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
- (alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
+ (alist-cons 'dry-run? #t result)))
(option '(#\v "verbosity") #t #f
(lambda (opt name arg result)
(let ((level (string->number* arg)))
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 61a3c95..a178761 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -1041,7 +1041,7 @@ Some ACTIONS support additional ARGS.\n"))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
- (alist-cons 'dry-run? #t (alist-cons 'graft? #f result))))
+ (alist-cons 'dry-run? #t result)))
(option '(#\v "verbosity") #t #f
(lambda (opt name arg result)
(let ((level (string->number* arg)))
- 01/11: store: Add 'map/accumulate-builds'., (continued)
- 01/11: store: Add 'map/accumulate-builds'., guix-commits, 2020/03/29
- 02/11: guix build: Use 'map/accumulate-builds'., guix-commits, 2020/03/29
- 03/11: gexp: 'lower-inputs' uses 'mapm/accumulate-builds'., guix-commits, 2020/03/29
- 04/11: profiles: Use 'mapm/accumulate-builds'., guix-commits, 2020/03/29
- 06/11: grafts: Don't rely on substitute info for missing store items., guix-commits, 2020/03/29
- 05/11: store: Add 'references/cached'., guix-commits, 2020/03/29
- 11/11: packages: Change 'guile-for-grafts' back to 2.0., guix-commits, 2020/03/29
- 09/11: gnu: Add guile3.0-websocket., guix-commits, 2020/03/29
- 08/11: services: shepherd: Mark '.go' derivations as non-substitutable., guix-commits, 2020/03/29
- 10/11: gnu: guile3.0-websocket: Install .go files in the right place., guix-commits, 2020/03/29
- 07/11: '--dry-run' no longer implies '--no-grafts'.,
guix-commits <=