From 548f7a8fa2a4745d0e35e175e201513857440991 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Sep 2014 10:47:05 +0200 Subject: Move operating system helpers from (guix build …) to (gnu build …). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/activation.scm, guix/build/install.scm, guix/build/linux-initrd.scm, guix/build/vm.scm: Move to... * gnu/build: ... here. * Makefile.am (MODULES): Remove the above guix/build/ files. * gnu-system.am (GNU_SYSTEM_MODULES): Add the above gnu/build/ files here. * gnu/services/base.scm, gnu/services/dmd.scm, gnu/system.scm, gnu/system/linux-initrd.scm, gnu/system/vm.scm, guix/scripts/system.scm: Adjust to the new module names. --- gnu/services/base.scm | 2 +- gnu/services/dmd.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/services') 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 @@ (define-module (gnu services base) #: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 (dmd-configuration-file services) (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 @@ (define config (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 -- cgit v1.2.3