diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-18 01:06:24 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-18 01:07:31 +0100 |
commit | 1ffa7090b99dfd2f54fa883929c5e78d7852657a (patch) | |
tree | 1c8bd191e31212e172b3e9158408cccd571a5020 /guix/build-system/gnu.scm | |
parent | 08ba7ff318720d926215de83daed0da628908ca3 (diff) |
distro: Change the module name space to (gnu ...).
* distro: Rename to...
* gnu: ... this. Update module names accordingly.
* Makefile.am: Adjust accordingly.
* po/POTFILES.in: Likewise.
* distro.scm: Search for files under /gnu/packages instead of
/distro/packages.
* gnu/packages/base.scm (ld-wrapper-boot3): Likewise.
Diffstat (limited to 'guix/build-system/gnu.scm')
-rw-r--r-- | guix/build-system/gnu.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 3eaed4bd78..4f84b3ccee 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -159,8 +159,8 @@ System: GCC, GNU Make, Bash, Coreutils, etc." (z (error "invalid standard input" z))) - ;; Resolve (distro packages base) lazily to hide circular dependency. - (let* ((distro (resolve-module '(distro packages base))) + ;; Resolve (gnu packages base) lazily to hide circular dependency. + (let* ((distro (resolve-module '(gnu packages base))) (inputs (module-ref distro '%final-inputs))) (append inputs (append-map (match-lambda @@ -233,7 +233,7 @@ which could lead to gratuitous input divergence." ((and (? string?) (? derivation-path?)) guile) (#f ; the default - (let* ((distro (resolve-interface '(distro packages base))) + (let* ((distro (resolve-interface '(gnu packages base))) (guile (module-ref distro 'guile-final))) (package-derivation store guile system))))) |