summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-07 22:49:08 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-07 23:12:37 +0100
commit7920e187c121977716d3399f5780553ba138f9b3 (patch)
treef25296df43d798f5994b518b369c2291ee57f2e3
parentcf69135d5e6797e566b8bb18419ae9e3c8aeb621 (diff)
downloadguix-patches-7920e187c121977716d3399f5780553ba138f9b3.tar
guix-patches-7920e187c121977716d3399f5780553ba138f9b3.tar.gz
scripts: All commands enable build hooks by default.
* guix/scripts/archive.scm (%default-options): Add 'build-hook?'. * guix/scripts/copy.scm (%default-options): Likewise. * guix/scripts/environment.scm (%default-options): Likewise. * guix/scripts/pack.scm (%default-options): Likewise. * guix/scripts/package.scm (%default-options): Likewise. * guix/scripts/pull.scm (%default-options): Likewise.
-rw-r--r--guix/scripts/archive.scm1
-rw-r--r--guix/scripts/copy.scm1
-rw-r--r--guix/scripts/environment.scm1
-rw-r--r--guix/scripts/pack.scm1
-rw-r--r--guix/scripts/package.scm3
-rw-r--r--guix/scripts/pull.scm1
-rw-r--r--guix/scripts/system.scm2
7 files changed, 8 insertions, 2 deletions
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index a569848ae3..a359f405fe 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -53,6 +53,7 @@
;; Alist of default option values.
`((system . ,(%current-system))
(substitutes? . #t)
+ (build-hook? . #t)
(graft? . #t)
(verbosity . 0)))
diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm
index 9ffffe8ccd..4c85929858 100644
--- a/guix/scripts/copy.scm
+++ b/guix/scripts/copy.scm
@@ -150,6 +150,7 @@ Copy ITEMS to or from the specified host over SSH.\n"))
(define %default-options
`((system . ,(%current-system))
(substitutes? . #t)
+ (build-hook? . #t)
(graft? . #t)
(verbosity . 0)))
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index e1b7feecfa..d2568e6a7d 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -178,6 +178,7 @@ COMMAND or an interactive shell in that environment.\n"))
(define %default-options
`((system . ,(%current-system))
(substitutes? . #t)
+ (build-hook? . #t)
(graft? . #t)
(verbosity . 0)))
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 21fea446a6..a22258d5a6 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -262,6 +262,7 @@ the image."
`((format . tarball)
(system . ,(%current-system))
(substitutes? . #t)
+ (build-hook? . #t)
(graft? . #t)
(verbosity . 0)
(symlinks . ())
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 0a4a07ae2a..617e102d93 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -360,7 +360,8 @@ ENTRIES, a list of manifest entries, in the context of PROFILE."
;; Alist of default option values.
`((verbosity . 0)
(graft? . #t)
- (substitutes? . #t)))
+ (substitutes? . #t)
+ (build-hook? . #t)))
(define (show-help)
(display (G_ "Usage: guix package [OPTION]...
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index be0c168444..64c2196e03 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -89,6 +89,7 @@ Install it by running:
(ref . (branch . "origin/master"))
(system . ,(%current-system))
(substitutes? . #t)
+ (build-hook? . #t)
(graft? . #t)
(verbosity . 0)))
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index e2ff42693f..d0eacc573c 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -942,8 +942,8 @@ Some ACTIONS support additional ARGS.\n"))
;; Alist of default option values.
`((system . ,(%current-system))
(substitutes? . #t)
- (graft? . #t)
(build-hook? . #t)
+ (graft? . #t)
(verbosity . 0)
(file-system-type . "ext4")
(image-size . guess)