diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
| commit | c00a9fbfef75d2fc08485f8158ec331bfa99d5ec (patch) | |
| tree | 4737817ee787c4ec8222ea13d3cfecb2ac98b673 /gnu-system.am | |
| parent | 83291101c39c1cd1bf472280c24ad68d94248c2e (diff) | |
| parent | dd16424466196616b99c13526537a89aaee27f88 (diff) | |
| download | patches-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar patches-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/base.scm
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 006fcab801..6213763326 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -54,6 +54,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/cflow.scm \ gnu/packages/check.scm \ gnu/packages/cmake.scm \ + gnu/packages/commencement.scm \ gnu/packages/compression.scm \ gnu/packages/complexity.scm \ gnu/packages/conkeror.scm \ @@ -233,9 +234,10 @@ GNU_SYSTEM_MODULES = \ gnu/packages/time.scm \ gnu/packages/tmux.scm \ gnu/packages/tor.scm \ - gnu/packages/uucp.scm \ + gnu/packages/unclutter.scm \ gnu/packages/unrtf.scm \ gnu/packages/upnp.scm \ + gnu/packages/uucp.scm \ gnu/packages/valgrind.scm \ gnu/packages/version-control.scm \ gnu/packages/video.scm \ |