From 18633d4f350160c2eb6f5101a628010322336e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Nov 2012 22:04:41 +0100 Subject: 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. --- tests/builders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/builders.scm') diff --git a/tests/builders.scm b/tests/builders.scm index d79603f7da..8b0fa117a9 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -25,6 +25,7 @@ #:use-module (guix utils) #:use-module (guix derivations) #:use-module ((guix packages) #:select (package-derivation)) + #:use-module (distro packages bootstrap) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64)) @@ -48,9 +49,6 @@ (list name (package-derivation %store package)))) (@@ (distro packages base) %boot0-inputs)))) -(define %bootstrap-guile - (@@ (distro packages base) %bootstrap-guile)) - (test-begin "builders") -- cgit v1.2.3