From 1f455fdca60c90710322d99ac529a31d71764a0d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Sep 2012 21:58:48 +0200 Subject: distro: Rename (distro ...) to (distro packages ...). * distro/base.scm, distro/ld-wrapper.scm: Move to `distro/packages'. Adjust LD-WRAPPER-BOOT3 input file name accordingly. * Makefile.am (MODULES): Adjust accordingly. * distro.scm (%distro-module-directory): Change to "/distro/packages". * guix/build-system/gnu.scm (standard-inputs): Change module name to (distro packages base). * tests/packages.scm (test-packages): Likewise. --- guix/build-system/gnu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix') diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 20f5bbacfc..b4a498bee7 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -87,8 +87,8 @@ System: GCC, GNU Make, Bash, Coreutils, etc." (z (error "invalid standard input" z))) - ;; Resolve (distro base) lazily to hide circular dependency. - (let* ((distro (resolve-module '(distro base))) + ;; Resolve (distro packages base) lazily to hide circular dependency. + (let* ((distro (resolve-module '(distro packages base))) (inputs (module-ref distro '%final-inputs))) (append inputs (append-map (match-lambda -- cgit v1.2.3