diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-04 22:04:41 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-04 22:04:41 +0100 |
| commit | 18633d4f350160c2eb6f5101a628010322336e91 (patch) | |
| tree | b4ecda9841422044bb583026e129624dd47f3c8f /tests/derivations.scm | |
| parent | 9d9e64508186e5f9efbe45302134cd709b25e47b (diff) | |
| download | guix-18633d4f350160c2eb6f5101a628010322336e91.tar guix-18633d4f350160c2eb6f5101a628010322336e91.tar.gz | |
distro: Move bootstrap packages to (distro packages bootstrap).
* distro/packages/base.scm (glibc-dynamic-linker, %bootstrap-guile,
bootstrap-origin, package-from-tarball, %bootstrap-base-url,
%bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc,
%bootstrap-gcc, %bootstrap-inputs, package-with-bootstrap-guile): Move
to ...
* distro/packages/bootstrap.scm: ... here. New file.
* Makefile.am (MODULES): Add it.
* tests/builders.scm: Use (distro packages bootstrap).
(%bootstrap-guile): Remove.
* tests/packages.scm: Likewise.
* tests/union.scm: Likewise, and remove @@ to access %bootstrap-inputs.
* tests/derivations.scm: Use (distro packages bootstrap) and remove @@
to access %bootstrap-coreutils&co.
* HACKING (When the platform is supported by Nixpkgs): Update
accordingly.
Diffstat (limited to 'tests/derivations.scm')
| -rw-r--r-- | tests/derivations.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index 02f0a9b2a1..684dac4d6f 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -22,7 +22,7 @@ #:use-module (guix store) #:use-module (guix utils) #:use-module ((guix packages) #:select (package-derivation)) - #:use-module ((distro packages base) #:select (%bootstrap-guile)) + #:use-module (distro packages bootstrap) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) @@ -209,9 +209,7 @@ (define %coreutils (false-if-exception - (or (package-derivation %store - (@@ (distro packages base) - %bootstrap-coreutils&co)) + (or (package-derivation %store %bootstrap-coreutils&co) (nixpkgs-derivation "coreutils")))) (test-skip (if %coreutils 0 1)) |