diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-16 01:01:54 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-16 01:01:54 -0400 |
| commit | 7d02724b7bddb4d5e1cc93db99f737baa26840ca (patch) | |
| tree | bae1377073af72dd17b7c786fd6991f234d3732b /gnu-system.am | |
| parent | 4c10c6cbc61d703b18b92c651a92300cf51d1eab (diff) | |
| parent | fef3cfaaab972b1f514724f90050aeb38516519b (diff) | |
| download | guix-7d02724b7bddb4d5e1cc93db99f737baa26840ca.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 247aff8ac7..9aa4bd1fb6 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -86,7 +86,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/dns.scm \ gnu/packages/docbook.scm \ gnu/packages/doxygen.scm \ - gnu/packages/dwm.scm \ gnu/packages/ebook.scm \ gnu/packages/ed.scm \ gnu/packages/elf.scm \ @@ -281,6 +280,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/ssh.scm \ gnu/packages/stalonetray.scm \ gnu/packages/statistics.scm \ + gnu/packages/suckless.scm \ gnu/packages/swig.scm \ gnu/packages/sxiv.scm \ gnu/packages/synergy.scm \ @@ -538,6 +538,18 @@ dist_patch_DATA = \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ gnu/packages/patches/qemu-CVE-2015-3209.patch \ gnu/packages/patches/qemu-CVE-2015-3456.patch \ + gnu/packages/patches/qemu-CVE-2015-4037.patch \ + gnu/packages/patches/qemu-CVE-2015-4103.patch \ + gnu/packages/patches/qemu-CVE-2015-4104.patch \ + gnu/packages/patches/qemu-CVE-2015-4105.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt1.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt2.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt3.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt4.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt5.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt6.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt7.patch \ + gnu/packages/patches/qemu-CVE-2015-4106-pt8.patch \ gnu/packages/patches/qt4-ldflags.patch \ gnu/packages/patches/qt4-tests.patch \ gnu/packages/patches/qt5-conflicting-typedefs.patch \ |