summaryrefslogtreecommitdiff
path: root/gnu-system.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-09-03 10:47:05 +0200
committerLudovic Courtès <ludo@gnu.org>2014-09-03 15:43:07 +0200
commit548f7a8fa2a4745d0e35e175e201513857440991 (patch)
tree5fa6118434b77716c93fac9ac2dac51ca257f807 /gnu-system.am
parent141360b5b257715fdca2db4fc106b4220788ae06 (diff)
Move operating system helpers from (guix build …) to (gnu build …).
* 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.
Diffstat (limited to 'gnu-system.am')
-rw-r--r--gnu-system.am16
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu-system.am b/gnu-system.am
index abfb27fade8..2c303ac109a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -28,7 +28,7 @@ GNU_SYSTEM_MODULES = \
28 gnu/packages/acl.scm \ 28 gnu/packages/acl.scm \
29 gnu/packages/admin.scm \ 29 gnu/packages/admin.scm \
30 gnu/packages/algebra.scm \ 30 gnu/packages/algebra.scm \
31 gnu/packages/aidc.scm \ 31 gnu/packages/aidc.scm \
32 gnu/packages/apl.scm \ 32 gnu/packages/apl.scm \
33 gnu/packages/apr.scm \ 33 gnu/packages/apr.scm \
34 gnu/packages/asciidoc.scm \ 34 gnu/packages/asciidoc.scm \
@@ -58,7 +58,7 @@ GNU_SYSTEM_MODULES = \
58 gnu/packages/compression.scm \ 58 gnu/packages/compression.scm \
59 gnu/packages/complexity.scm \ 59 gnu/packages/complexity.scm \
60 gnu/packages/conkeror.scm \ 60 gnu/packages/conkeror.scm \
61 gnu/packages/cook.scm \ 61 gnu/packages/cook.scm \
62 gnu/packages/cpio.scm \ 62 gnu/packages/cpio.scm \
63 gnu/packages/cppi.scm \ 63 gnu/packages/cppi.scm \
64 gnu/packages/cross-base.scm \ 64 gnu/packages/cross-base.scm \
@@ -151,7 +151,7 @@ GNU_SYSTEM_MODULES = \
151 gnu/packages/lightning.scm \ 151 gnu/packages/lightning.scm \
152 gnu/packages/links.scm \ 152 gnu/packages/links.scm \
153 gnu/packages/linux.scm \ 153 gnu/packages/linux.scm \
154 gnu/packages/lisp.scm \ 154 gnu/packages/lisp.scm \
155 gnu/packages/lout.scm \ 155 gnu/packages/lout.scm \
156 gnu/packages/lsh.scm \ 156 gnu/packages/lsh.scm \
157 gnu/packages/lsof.scm \ 157 gnu/packages/lsof.scm \
@@ -180,7 +180,7 @@ GNU_SYSTEM_MODULES = \
180 gnu/packages/nettle.scm \ 180 gnu/packages/nettle.scm \
181 gnu/packages/node.scm \ 181 gnu/packages/node.scm \
182 gnu/packages/noweb.scm \ 182 gnu/packages/noweb.scm \
183 gnu/packages/nvi.scm \ 183 gnu/packages/nvi.scm \
184 gnu/packages/ocaml.scm \ 184 gnu/packages/ocaml.scm \
185 gnu/packages/ocrad.scm \ 185 gnu/packages/ocrad.scm \
186 gnu/packages/onc-rpc.scm \ 186 gnu/packages/onc-rpc.scm \
@@ -277,7 +277,13 @@ GNU_SYSTEM_MODULES = \
277 gnu/system/linux.scm \ 277 gnu/system/linux.scm \
278 gnu/system/linux-initrd.scm \ 278 gnu/system/linux-initrd.scm \
279 gnu/system/shadow.scm \ 279 gnu/system/shadow.scm \
280 gnu/system/vm.scm 280 gnu/system/vm.scm \
281 \
282 gnu/build/activation.scm \
283 gnu/build/install.scm \
284 gnu/build/linux-initrd.scm \
285 gnu/build/vm.scm
286
281 287
282patchdir = $(guilemoduledir)/gnu/packages/patches 288patchdir = $(guilemoduledir)/gnu/packages/patches
283dist_patch_DATA = \ 289dist_patch_DATA = \