diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-09-26 21:58:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-09-26 22:00:58 +0200 |
| commit | 1f455fdca60c90710322d99ac529a31d71764a0d (patch) | |
| tree | 0c16dde04916403e121efe843ab4227a0aad0b0a /guix | |
| parent | 8ffae202acca491c7ebceb094018c79a6d5f2b3a (diff) | |
| download | gnu-guix-1f455fdca60c90710322d99ac529a31d71764a0d.tar gnu-guix-1f455fdca60c90710322d99ac529a31d71764a0d.tar.gz | |
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.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build-system/gnu.scm | 4 |
1 files changed, 2 insertions, 2 deletions
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 |