diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | gnu-system.am | 16 | ||||
| -rw-r--r-- | gnu/build/activation.scm (renamed from guix/build/activation.scm) | 4 | ||||
| -rw-r--r-- | gnu/build/install.scm (renamed from guix/build/install.scm) | 3 | ||||
| -rw-r--r-- | gnu/build/linux-initrd.scm (renamed from guix/build/linux-initrd.scm) | 2 | ||||
| -rw-r--r-- | gnu/build/vm.scm (renamed from guix/build/vm.scm) | 6 | ||||
| -rw-r--r-- | gnu/services/base.scm | 2 | ||||
| -rw-r--r-- | gnu/services/dmd.scm | 4 | ||||
| -rw-r--r-- | gnu/system.scm | 8 | ||||
| -rw-r--r-- | gnu/system/linux-initrd.scm | 6 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 12 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 2 |
12 files changed, 35 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index 371b85c235..d25eeeb76e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,6 @@ MODULES = \ guix/build/git.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ - guix/build/linux-initrd.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ guix/build/utils.scm \ @@ -70,9 +69,6 @@ MODULES = \ guix/build/pull.scm \ guix/build/rpath.scm \ guix/build/svn.scm \ - guix/build/vm.scm \ - guix/build/install.scm \ - guix/build/activation.scm \ guix/build/syscalls.scm \ guix/build/emacs-utils.scm \ guix/packages.scm \ diff --git a/gnu-system.am b/gnu-system.am index abfb27fade..2c303ac109 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -28,7 +28,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/acl.scm \ gnu/packages/admin.scm \ gnu/packages/algebra.scm \ - gnu/packages/aidc.scm \ + gnu/packages/aidc.scm \ gnu/packages/apl.scm \ gnu/packages/apr.scm \ gnu/packages/asciidoc.scm \ @@ -58,7 +58,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/compression.scm \ gnu/packages/complexity.scm \ gnu/packages/conkeror.scm \ - gnu/packages/cook.scm \ + gnu/packages/cook.scm \ gnu/packages/cpio.scm \ gnu/packages/cppi.scm \ gnu/packages/cross-base.scm \ @@ -151,7 +151,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/lightning.scm \ gnu/packages/links.scm \ gnu/packages/linux.scm \ - gnu/packages/lisp.scm \ + gnu/packages/lisp.scm \ gnu/packages/lout.scm \ gnu/packages/lsh.scm \ gnu/packages/lsof.scm \ @@ -180,7 +180,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/nettle.scm \ gnu/packages/node.scm \ gnu/packages/noweb.scm \ - gnu/packages/nvi.scm \ + gnu/packages/nvi.scm \ gnu/packages/ocaml.scm \ gnu/packages/ocrad.scm \ gnu/packages/onc-rpc.scm \ @@ -277,7 +277,13 @@ GNU_SYSTEM_MODULES = \ gnu/system/linux.scm \ gnu/system/linux-initrd.scm \ gnu/system/shadow.scm \ - gnu/system/vm.scm + gnu/system/vm.scm \ + \ + gnu/build/activation.scm \ + gnu/build/install.scm \ + gnu/build/linux-initrd.scm \ + gnu/build/vm.scm + patchdir = $(guilemoduledir)/gnu/packages/patches dist_patch_DATA = \ diff --git a/guix/build/activation.scm b/gnu/build/activation.scm index b04b017881..bb1165ac47 100644 --- a/guix/build/activation.scm +++ b/gnu/build/activation.scm @@ -16,9 +16,9 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -(define-module (guix build activation) +(define-module (gnu build activation) + #:use-module (gnu build linux-initrd) #:use-module (guix build utils) - #:use-module (guix build linux-initrd) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (srfi srfi-1) diff --git a/guix/build/install.scm b/gnu/build/install.scm index 5bafe905de..e16896f8b8 100644 --- a/guix/build/install.scm +++ b/gnu/build/install.scm @@ -16,9 +16,8 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -(define-module (guix build install) +(define-module (gnu build install) #:use-module (guix build utils) - #:use-module (guix build install) #:use-module (srfi srfi-26) #:use-module (ice-9 match) #:export (install-grub diff --git a/guix/build/linux-initrd.scm b/gnu/build/linux-initrd.scm index d37da9a6ff..60c5eec10f 100644 --- a/guix/build/linux-initrd.scm +++ b/gnu/build/linux-initrd.scm @@ -16,7 +16,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -(define-module (guix build linux-initrd) +(define-module (gnu build linux-initrd) #:use-module (rnrs io ports) #:use-module (rnrs bytevectors) #:use-module (system foreign) diff --git a/guix/build/vm.scm b/gnu/build/vm.scm index 11e05f70be..d724ca3a55 100644 --- a/guix/build/vm.scm +++ b/gnu/build/vm.scm @@ -16,10 +16,10 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -(define-module (guix build vm) +(define-module (gnu build vm) #:use-module (guix build utils) - #:use-module (guix build linux-initrd) - #:use-module (guix build install) + #:use-module (gnu build linux-initrd) + #:use-module (gnu build install) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 rdelim) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 578d4cba71..274b6f5b77 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -29,7 +29,7 @@ #:use-module ((gnu packages base) #:select (canonical-package glibc)) #:use-module (gnu packages package-management) - #:use-module ((guix build linux-initrd) + #:use-module ((gnu build linux-initrd) #:select (mount-flags->bit-mask)) #:use-module (guix gexp) #:use-module (guix monads) diff --git a/gnu/services/dmd.scm b/gnu/services/dmd.scm index dfda2708f5..87bd67a8da 100644 --- a/gnu/services/dmd.scm +++ b/gnu/services/dmd.scm @@ -35,7 +35,7 @@ (define modules ;; Extra modules visible to dmd.conf. '((guix build syscalls) - (guix build linux-initrd) + (gnu build linux-initrd) (guix build utils))) (mlet %store-monad ((modules (imported-modules modules)) @@ -50,7 +50,7 @@ (use-modules (ice-9 ftw) (guix build syscalls) (guix build utils) - ((guix build linux-initrd) + ((gnu build linux-initrd) #:select (check-file-system canonicalize-device-spec))) (register-services diff --git a/gnu/system.scm b/gnu/system.scm index 2469ade1f3..963f4864f8 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -362,9 +362,9 @@ alias ll='ls -l' stateful part of OS, including user accounts and groups, special directories, etc." (define %modules - '((guix build activation) - (guix build utils) - (guix build linux-initrd))) + '((gnu build activation) + (gnu build linux-initrd) + (guix build utils))) (define (service-activations services) ;; Return the activation scripts for SERVICES. @@ -399,7 +399,7 @@ etc." (set! %load-compiled-path (cons #$compiled %load-compiled-path))) - (use-modules (guix build activation)) + (use-modules (gnu build activation)) ;; Populate /etc. (activate-etc #$etc) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index e48b399a9d..6d9e23277f 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -75,7 +75,7 @@ initrd." (mlet* %store-monad ((source (imported-modules modules)) (compiled (compiled-modules modules))) (define builder - ;; TODO: Move most of this code to (guix build linux-initrd). + ;; TODO: Move most of this code to (gnu build linux-initrd). #~(begin (use-modules (guix build utils) (ice-9 pretty-print) @@ -277,7 +277,7 @@ exception and backtrace!)." (expression->initrd #~(begin - (use-modules (guix build linux-initrd) + (use-modules (gnu build linux-initrd) (guix build utils) (srfi srfi-26)) @@ -293,7 +293,7 @@ exception and backtrace!)." #:volatile-root? '#$volatile-root?)) #:name "base-initrd" #:modules '((guix build utils) - (guix build linux-initrd)) + (gnu build linux-initrd)) #:to-copy helper-packages #:linux linux-libre #:linux-modules linux-modules)) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 42fc23ee8f..be9cf6b457 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -23,7 +23,7 @@ #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix monads) - #:use-module ((guix build vm) + #:use-module ((gnu build vm) #:select (qemu-command)) #:use-module (gnu packages base) #:use-module (gnu packages guile) @@ -112,9 +112,9 @@ input tuple. The output file name is when building for SYSTEM." (qemu qemu-headless) (env-vars '()) (modules - '((guix build vm) - (guix build install) - (guix build linux-initrd) + '((gnu build vm) + (gnu build install) + (gnu build linux-initrd) (guix build utils))) (guile-for-build (%guile-for-build)) @@ -164,7 +164,7 @@ made available under the /xchg CIFS share." ;; Code that launches the VM that evaluates EXP. #~(begin (use-modules (guix build utils) - (guix build vm)) + (gnu build vm)) (let ((inputs '#$(list qemu coreutils)) (linux (string-append #$linux "/bzImage")) @@ -222,7 +222,7 @@ the image." (expression->derivation-in-linux-vm name #~(begin - (use-modules (guix build vm) + (use-modules (gnu build vm) (guix build utils)) (let ((inputs diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 4f1869af38..7c0dde9030 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -28,7 +28,7 @@ #:use-module (guix profiles) #:use-module (guix scripts build) #:use-module (guix build utils) - #:use-module (guix build install) + #:use-module (gnu build install) #:use-module (gnu system) #:use-module (gnu system vm) #:use-module (gnu system grub) |