diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-03 10:47:05 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-03 15:43:07 +0200 |
| commit | 548f7a8fa2a4745d0e35e175e201513857440991 (patch) | |
| tree | 5fa6118434b77716c93fac9ac2dac51ca257f807 /gnu-system.am | |
| parent | 141360b5b257715fdca2db4fc106b4220788ae06 (diff) | |
| download | patches-548f7a8fa2a4745d0e35e175e201513857440991.tar patches-548f7a8fa2a4745d0e35e175e201513857440991.tar.gz | |
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.am | 16 |
1 files changed, 11 insertions, 5 deletions
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 = \ |