diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-10 23:54:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-10 23:54:17 +0100 |
| commit | e06f7865e2630494a522ac32b9c0a0311be3e1e2 (patch) | |
| tree | 1a547ad3a2e4c1b98a67845a9de0dfc798227b5f /gnu-system.am | |
| parent | ff3c0c1b805453990a42f690f148b41b9dff382a (diff) | |
| parent | c9c88118a12b0e22b7369b1dc6b0e2f9db894986 (diff) | |
| download | patches-e06f7865e2630494a522ac32b9c0a0311be3e1e2.tar patches-e06f7865e2630494a522ac32b9c0a0311be3e1e2.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 97dc92cdfc..9f4f959d46 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,7 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013 Andreas Enge <andreas@enge.fr> -# Copyright © 2013 Mark H Weaver <mhw@netris.org> +# Copyright © 2013, 2014 Mark H Weaver <mhw@netris.org> # # This file is part of GNU Guix. # @@ -139,10 +139,12 @@ GNU_SYSTEM_MODULES = \ gnu/packages/lsof.scm \ gnu/packages/lua.scm \ gnu/packages/lvm.scm \ + gnu/packages/lynx.scm \ gnu/packages/m4.scm \ gnu/packages/mail.scm \ gnu/packages/make-bootstrap.scm \ gnu/packages/maths.scm \ + gnu/packages/messaging.scm \ gnu/packages/mit-krb5.scm \ gnu/packages/moe.scm \ gnu/packages/mpd.scm \ @@ -174,6 +176,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/popt.scm \ gnu/packages/pth.scm \ gnu/packages/pulseaudio.scm \ + gnu/packages/pretty-print.scm \ gnu/packages/python.scm \ gnu/packages/qemu.scm \ gnu/packages/qt.scm \ @@ -249,6 +252,8 @@ dist_patch_DATA = \ gnu/packages/patches/bigloo-gc-shebangs.patch \ gnu/packages/patches/binutils-ld-new-dtags.patch \ gnu/packages/patches/binutils-loongson-workaround.patch \ + gnu/packages/patches/bitlbee-fix-tests.patch \ + gnu/packages/patches/bitlbee-memset-fix.patch \ gnu/packages/patches/cdparanoia-fpic.patch \ gnu/packages/patches/cmake-fix-tests.patch \ gnu/packages/patches/coreutils-dummy-man.patch \ @@ -318,6 +323,7 @@ dist_patch_DATA = \ gnu/packages/patches/slim-session.patch \ gnu/packages/patches/slim-config.patch \ gnu/packages/patches/slim-sigusr1.patch \ + gnu/packages/patches/source-highlight-regexrange-test.patch \ gnu/packages/patches/tcsh-fix-autotest.patch \ gnu/packages/patches/teckit-cstdio.patch \ gnu/packages/patches/valgrind-glibc.patch \ |