diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
| commit | fe6d003908fd8278de65761bc550240c520ef9f4 (patch) | |
| tree | abe88c7905a8907ddafc554fbeef5b0af08f835d /guix/scripts | |
| parent | 8a7a5dc7805f4628e60f90af6b2416f951d0c034 (diff) | |
| parent | 031315e4f0fbc4e04ffc8adee04128c23173a1f7 (diff) | |
| download | guix-patches-fe6d003908fd8278de65761bc550240c520ef9f4.tar guix-patches-fe6d003908fd8278de65761bc550240c520ef9f4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/size.scm | 4 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index 2446b84587..c42f4f7782 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -230,8 +230,8 @@ the name of a PNG file." ;;; (define (show-help) - (display (G_ "Usage: guix size [OPTION]... PACKAGE -Report the size of PACKAGE and its dependencies.\n")) + (display (G_ "Usage: guix size [OPTION]... PACKAGE|STORE-ITEM +Report the size of the PACKAGE or STORE-ITEM, with its dependencies.\n")) (display (G_ " --substitute-urls=URLS fetch substitute from URLS if they are authorized")) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 3efd113ac8..3d7aa77cb7 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -670,7 +670,7 @@ checking this by themselves in their 'check' procedure." ;;; Action. ;;; -(define* (system-derivation-for-action os action +(define* (system-derivation-for-action os base-image action #:key image-size file-system-type full-boot? container-shared-network? mappings) @@ -694,11 +694,12 @@ checking this by themselves in their 'check' procedure." (* 70 (expt 2 20))) #:mappings mappings)) ((disk-image) - (system-image - (image - (inherit (find-image file-system-type)) - (size image-size) - (operating-system os)))) + (lower-object + (system-image + (image + (inherit base-image) + (size image-size) + (operating-system os))))) ((docker-image) (system-docker-image os #:shared-network? container-shared-network?)))) @@ -800,7 +801,8 @@ static checks." (check-initrd-modules os))) (mlet* %store-monad - ((sys (system-derivation-for-action os action + ((image (find-image file-system-type)) + (sys (system-derivation-for-action os image action #:file-system-type file-system-type #:image-size image-size #:full-boot? full-boot? |