diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-08-27 00:25:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-08-28 09:21:54 +0200 |
| commit | bdb36958fb50fa5d9fb8b79a32a41fa74a619563 (patch) | |
| tree | dce8d5f36d7a7b0e77ee624ec14045f8ba4bd560 /gnu/system | |
| parent | 5c3eb14e072de2549e89073b002ac072fd4b35dc (diff) | |
| download | guix-bdb36958fb50fa5d9fb8b79a32a41fa74a619563.tar guix-bdb36958fb50fa5d9fb8b79a32a41fa74a619563.tar.gz | |
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/vm.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index db78c56683..42fc23ee8f 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -25,9 +25,9 @@ #:use-module (guix monads) #:use-module ((guix build vm) #:select (qemu-command)) - #:use-module ((gnu packages base) - #:select (%final-inputs)) + #:use-module (gnu packages base) #:use-module (gnu packages guile) + #:use-module (gnu packages gawk) #:use-module (gnu packages bash) #:use-module (gnu packages less) #:use-module (gnu packages qemu) @@ -152,7 +152,7 @@ made available under the /xchg CIFS share." (cons #$compiled %load-compiled-path)) (primitive-load #$user-builder)))) - (coreutils -> (car (assoc-ref %final-inputs "coreutils"))) + (coreutils -> (canonical-package coreutils)) (initrd (if initrd ; use the default initrd? (return initrd) (base-initrd %linux-vm-file-systems @@ -227,8 +227,8 @@ the image." (let ((inputs '#$(append (list qemu parted grub e2fsprogs util-linux) - (map (compose car (cut assoc-ref %final-inputs <>)) - '("sed" "grep" "coreutils" "findutils" "gawk")) + (map canonical-package + (list sed grep coreutils findutils gawk)) (if register-closures? (list guix) '()))) ;; This variable is unused but allows us to add INPUTS-TO-COPY |