diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
| commit | e759c0a38c799f2d03b3454e9ca6acf2262dc957 (patch) | |
| tree | 08f5a1414410bc6719205090ac07484b308ba918 /gnu/services | |
| parent | 11459384968f654c42ad7dba4443dada35191f5b (diff) | |
| parent | 4a4cbd0bdd2ad8c4f37c3ffdd69596ef1ef41d91 (diff) | |
| download | patches-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar patches-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 2 | ||||
| -rw-r--r-- | gnu/services/dmd.scm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 578d4cba71..b5b49d1a01 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 file-systems) #: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..59c2373779 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 file-systems) (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 file-systems) #:select (check-file-system canonicalize-device-spec))) (register-services |