tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-08 14:10:38 +02:00
Code Activity

Merge branch 'master' into core-updates

Browse Source 
Conflicts:
	gnu/packages/base.scm
This commit is contained in:
Mark H Weaver
2014-08-28 14:22:15 -04:00
parent 83291101c3 dd16424466
commit c00a9fbfef
39 changed files with 1008 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnu-system.am
View File

@@ -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 \