From c1ef50ac79ff56bebe81a173a858d83a1bee6a36 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Apr 2019 17:28:00 +0200 Subject: gexp: Remove workarounds for . * gnu/services/base.scm (hydra-key-authorization)[aaa]: Remove. [default-acl]: Don't import it. * guix/scripts/pack.scm (store-database)[build]: Don't import (gnu build install). --- guix/scripts/pack.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'guix/scripts/pack.scm') diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index e5502ef9ca..d2ef68d153 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -126,13 +126,9 @@ (define labels (define build (with-extensions gcrypt-sqlite3&co - ;; XXX: Adding (gnu build install) just to work around - ;; : that way, (guix build store-copy) is - ;; copied last and the 'store-info-XXX' macros are correctly expanded. (with-imported-modules (source-module-closure '((guix build store-copy) - (guix store database) - (gnu build install))) + (guix store database))) #~(begin (use-modules (guix store database) (guix build store-copy) -- cgit v1.2.3 From 985730c1afac6b5077df9ca8a871db9750ac3a9d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Apr 2019 17:32:37 +0200 Subject: scripts: More commands default to verbosity level 1. * guix/scripts/environment.scm (%default-options): Change 'verbosity' to 1. * guix/scripts/pack.scm (%default-options): Likewise. * guix/scripts/system.scm (guix-system): Likewise, except for the 'build' command. --- guix/scripts/environment.scm | 2 +- guix/scripts/pack.scm | 2 +- guix/scripts/system.scm | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'guix/scripts/pack.scm') diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 2d1ba4c938..99c351ae43 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -192,7 +192,7 @@ (define %default-options (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) (debug . 0) - (verbosity . 2))) + (verbosity . 1))) (define (tag-package-arg opts arg) "Return a two-element list with the form (TAG ARG) that tags ARG with either diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index d2ef68d153..b1d1e87c57 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -629,7 +629,7 @@ (define %default-options (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) (debug . 0) - (verbosity . 2) + (verbosity . 1) (symlinks . ()) (compressor . ,(first %compressors)))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 97508f4bd6..78aa6cf644 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1299,8 +1299,7 @@ (define (fail) (command (assoc-ref opts 'action))) (parameterize ((%graft? (assoc-ref opts 'graft?))) (with-status-verbosity (or (assoc-ref opts 'verbosity) - (if (memq command '(init reconfigure)) - 1 2)) + (if (eq? command 'build) 2 1)) (process-command command args opts)))))) ;;; Local Variables: -- cgit v1.2.3