mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
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.
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
#:use-module (guix base32)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module ((guix packages) #:select (package-derivation))
|
||||
#:use-module (distro packages bootstrap)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-64))
|
||||
@@ -48,7 +48,7 @@
|
||||
(map (match-lambda
|
||||
((name package)
|
||||
(list name (package-derivation %store package))))
|
||||
(@@ (distro packages base) %boot0-inputs))))
|
||||
(@@ (gnu packages base) %boot0-inputs))))
|
||||
|
||||
(define network-reachable?
|
||||
(false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)))
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#:use-module (guix base32)
|
||||
#:use-module ((guix packages) #:select (package-derivation))
|
||||
#:use-module ((distro) #:select (search-bootstrap-binary))
|
||||
#:use-module (distro packages bootstrap)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-11)
|
||||
#:use-module (srfi srfi-26)
|
||||
|
||||
@@ -27,11 +27,11 @@ if guix-build -e +;
|
||||
then false; else true; fi
|
||||
|
||||
# Should fail because this is a source-less package.
|
||||
if guix-build -e '(@ (distro packages bootstrap) %bootstrap-glibc)' -S
|
||||
if guix-build -e '(@ (gnu packages bootstrap) %bootstrap-glibc)' -S
|
||||
then false; else true; fi
|
||||
|
||||
# Should pass.
|
||||
guix-build -e '(@@ (distro packages base) %bootstrap-guile)' | \
|
||||
guix-build -e '(@@ (gnu packages base) %bootstrap-guile)' | \
|
||||
grep -e '-guile-'
|
||||
guix-build hello -d | \
|
||||
grep -e '-hello-[0-9\.]\+\.drv$'
|
||||
@@ -42,11 +42,11 @@ if guix-build hello-0.0.1 -n; then false; else true; fi
|
||||
# Keep a symlink to the result, registered as a root.
|
||||
result="t-result-$$"
|
||||
guix-build -r "$result" \
|
||||
-e '(@@ (distro packages base) %bootstrap-guile)'
|
||||
-e '(@@ (gnu packages base) %bootstrap-guile)'
|
||||
test -x "$result/bin/guile"
|
||||
|
||||
# Should fail, because $result already exists.
|
||||
if guix-build -r "$result" -e '(@@ (distro packages base) %bootstrap-guile)'
|
||||
if guix-build -r "$result" -e '(@@ (gnu packages base) %bootstrap-guile)'
|
||||
then false; else true; fi
|
||||
|
||||
rm -f "$result"
|
||||
|
||||
@@ -25,5 +25,5 @@ set -e
|
||||
guix-daemon --version
|
||||
guix-build --version
|
||||
|
||||
guix-build -e '(@ (distro packages bootstrap) %bootstrap-guile)'
|
||||
guix-build -e '(@ (gnu packages bootstrap) %bootstrap-guile)'
|
||||
guix-build coreutils -n
|
||||
|
||||
@@ -32,7 +32,7 @@ rm -f "$profile"
|
||||
|
||||
trap 'rm "$profile" "$profile-"[0-9]* ; rm -rf t-home-'"$$" EXIT
|
||||
|
||||
boot_guile="`guix-build -e '(@ (distro packages bootstrap) %bootstrap-guile)'`"
|
||||
boot_guile="`guix-build -e '(@ (gnu packages bootstrap) %bootstrap-guile)'`"
|
||||
|
||||
guix-package --bootstrap -p "$profile" -i "$boot_guile"
|
||||
test -L "$profile" && test -L "$profile-1-link"
|
||||
@@ -47,7 +47,7 @@ test -f "$profile/bin/guile"
|
||||
# Check whether we have network access.
|
||||
if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
|
||||
then
|
||||
boot_make="`guix-build -e '(@@ (distro packages base) gnu-make-boot0)'`"
|
||||
boot_make="`guix-build -e '(@@ (gnu packages base) gnu-make-boot0)'`"
|
||||
guix-package --bootstrap -p "$profile" -i "$boot_make"
|
||||
test -L "$profile-2-link"
|
||||
test -f "$profile/bin/make" && test -f "$profile/bin/guile"
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (distro)
|
||||
#:use-module (distro packages base)
|
||||
#:use-module (distro packages bootstrap)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (rnrs io ports)
|
||||
@@ -130,7 +130,7 @@
|
||||
(test-assert "GNU Make, bootstrap"
|
||||
;; GNU Make is the first program built during bootstrap; we choose it
|
||||
;; here so that the test doesn't last for too long.
|
||||
(let ((gnu-make (@@ (distro packages base) gnu-make-boot0)))
|
||||
(let ((gnu-make (@@ (gnu packages base) gnu-make-boot0)))
|
||||
(and (package? gnu-make)
|
||||
(or (location? (package-location gnu-make))
|
||||
(not (package-location gnu-make)))
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix base32)
|
||||
#:use-module (distro packages bootstrap)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-11)
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#:use-module (guix build union)
|
||||
#:use-module ((guix build utils)
|
||||
#:select (with-directory-excursion directory-exists?))
|
||||
#:use-module (distro packages bootstrap)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
Reference in New Issue
Block a user