summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-01-18 01:06:24 +0100
committerLudovic Courtès <ludo@gnu.org>2013-01-18 01:07:31 +0100
commit1ffa7090b99dfd2f54fa883929c5e78d7852657a (patch)
tree1c8bd191e31212e172b3e9158408cccd571a5020 /guix
parent08ba7ff318720d926215de83daed0da628908ca3 (diff)
downloadgnu-guix-1ffa7090b99dfd2f54fa883929c5e78d7852657a.tar
gnu-guix-1ffa7090b99dfd2f54fa883929c5e78d7852657a.tar.gz
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')
-rw-r--r--guix/build-system/gnu.scm6
-rw-r--r--guix/build-system/trivial.scm2
-rw-r--r--guix/download.scm2
3 files changed, 5 insertions, 5 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)))))
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm
index 866657fdf6..e5bbeaa91d 100644
--- a/guix/build-system/trivial.scm
+++ b/guix/build-system/trivial.scm
@@ -36,7 +36,7 @@ ignored."
((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)))))
diff --git a/guix/download.scm b/guix/download.scm
index 3372567b47..cf68ade74b 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -118,7 +118,7 @@ must be a list of symbol/URL-list pairs."
((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)))))