diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-01-24 21:04:54 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-01-24 21:04:54 -0500 |
| commit | 412bee5e2931a53066ae593808935608d54a4345 (patch) | |
| tree | 28b297694296115f056ead6de81d24bbd98d75f5 /gnu-system.am | |
| parent | 68716289995d106c7adc779548eebc5df324e6cf (diff) | |
| parent | 880d647d0f1a0ea0aea2af84fa2e99e3286b65a1 (diff) | |
| download | gnu-guix-412bee5e2931a53066ae593808935608d54a4345.tar gnu-guix-412bee5e2931a53066ae593808935608d54a4345.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index d37775d235..297f40a50e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> -# Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> +# Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> # # This file is part of GNU Guix. @@ -177,6 +177,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/kodi.scm \ gnu/packages/language.scm \ gnu/packages/ldc.scm \ + gnu/packages/lego.scm \ gnu/packages/less.scm \ gnu/packages/lesstif.scm \ gnu/packages/libcanberra.scm \ @@ -408,6 +409,7 @@ dist_patch_DATA = \ gnu/packages/patches/agg-am_c_prototype.patch \ gnu/packages/patches/alsa-lib-mips-atomic-fix.patch \ gnu/packages/patches/apr-skip-getservbyname-test.patch \ + gnu/packages/patches/arb-ldconfig.patch \ gnu/packages/patches/asymptote-gsl2.patch \ gnu/packages/patches/ath9k-htc-firmware-binutils.patch \ gnu/packages/patches/ath9k-htc-firmware-gcc.patch \ @@ -568,6 +570,7 @@ dist_patch_DATA = \ gnu/packages/patches/libwmf-CVE-2015-4695.patch \ gnu/packages/patches/libwmf-CVE-2015-4696.patch \ gnu/packages/patches/libxslt-CVE-2015-7995.patch \ + gnu/packages/patches/linux-libre-CVE-2016-0728.patch \ gnu/packages/patches/lirc-localstatedir.patch \ gnu/packages/patches/libpthread-glibc-preparation.patch \ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \ @@ -686,6 +689,7 @@ dist_patch_DATA = \ gnu/packages/patches/tidy-CVE-2015-5522+5523.patch \ gnu/packages/patches/tinyxml-use-stl.patch \ gnu/packages/patches/tk-find-library.patch \ + gnu/packages/patches/tophat-build-with-later-seqan.patch \ gnu/packages/patches/torsocks-dns-test.patch \ gnu/packages/patches/tvtime-gcc41.patch \ gnu/packages/patches/tvtime-pngoutput.patch \ |