diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-22 18:58:48 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-22 18:58:48 +0200 |
| commit | ccad0e4d6973da7af8badfb7125f35f7e51eb2d7 (patch) | |
| tree | 15ff9da1c1c03b088d0ad9240f2c1878f5da5802 /guix/scripts | |
| parent | d478cc043557ca3fcd5fced87d2e2c8e246eff03 (diff) | |
| parent | 26986544469ef290885f5f8d71006751e9e8daf8 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/archive.scm | 1 | ||||
| -rw-r--r-- | guix/scripts/lint.scm | 7 | ||||
| -rw-r--r-- | guix/scripts/pack.scm | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index d349b5d590..fba0f73826 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -30,6 +30,7 @@ #:use-module (guix monads) #:use-module (guix ui) #:use-module (guix pki) + #:use-module (gcrypt common) #:use-module (gcrypt pk-crypto) #:use-module (guix scripts) #:use-module (guix scripts build) diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index 98ee469501..ee1c826d2e 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -46,10 +46,9 @@ (lambda (lint-warning) (let ((package (lint-warning-package lint-warning)) (loc (lint-warning-location lint-warning))) - (format (guix-warning-port) "~a: ~a@~a: ~a~%" - (location->string loc) - (package-name package) (package-version package) - (lint-warning-message lint-warning)))) + (warning loc (G_ "~a@~a: ~a~%") + (package-name package) (package-version package) + (lint-warning-message lint-warning)))) warnings)) (define (run-checkers package checkers) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 1524607623..8d958b550f 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -509,9 +509,10 @@ the image." #:database #+database #:system (or #$target (utsname:machine (uname))) #:environment environment - #:entry-point #$(and entry-point - #~(string-append #$profile "/" - #$entry-point)) + #:entry-point + #$(and entry-point + #~(list (string-append #$profile "/" + #$entry-point))) #:symlinks '#$symlinks #:compressor '#$(compressor-command compressor) #:creation-time (make-time time-utc 0 1)))))) |