Merge branch 'master' into core-updates

[jackhill/guix/guix.git] / gnu-system.am

diff --git a/gnu-system.am b/gnu-system.am
index f2f03f7..f67e077 100644 (file)
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -86,6 +86,7 @@ GNU_SYSTEM_MODULES =                          \
   gnu/packages/dns.scm                         \
   gnu/packages/docbook.scm                     \
   gnu/packages/doxygen.scm                     \
+  gnu/packages/dunst.scm                       \
   gnu/packages/ebook.scm                       \
   gnu/packages/ed.scm                          \
   gnu/packages/elf.scm                         \
@@ -192,6 +193,7 @@ GNU_SYSTEM_MODULES =                                \
   gnu/packages/lsh.scm                         \
   gnu/packages/lsof.scm                                \
   gnu/packages/lua.scm                         \
+  gnu/packages/lxde.scm                                \
   gnu/packages/lxqt.scm                                \
   gnu/packages/lynx.scm                                \
   gnu/packages/m4.scm                          \
@@ -256,6 +258,7 @@ GNU_SYSTEM_MODULES =                                \
   gnu/packages/qemu.scm                                \
   gnu/packages/qt.scm                          \
   gnu/packages/ratpoison.scm                   \
+  gnu/packages/rc.scm                          \
   gnu/packages/rdesktop.scm                    \
   gnu/packages/rdf.scm                         \
   gnu/packages/readline.scm                    \
@@ -272,6 +275,7 @@ GNU_SYSTEM_MODULES =                                \
   gnu/packages/search.scm                      \
   gnu/packages/serveez.scm                     \
   gnu/packages/shishi.scm                      \
+  gnu/packages/skarnet.scm                     \
   gnu/packages/skribilo.scm                    \
   gnu/packages/slang.scm                       \
   gnu/packages/slim.scm                                \
@@ -391,6 +395,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/binutils-ld-new-dtags.patch             \
   gnu/packages/patches/binutils-loongson-workaround.patch      \
   gnu/packages/patches/bitlbee-configure-doc-fix.patch         \
+  gnu/packages/patches/boost-mips-avoid-m32.patch              \
   gnu/packages/patches/calibre-drop-unrar.patch                        \
   gnu/packages/patches/calibre-no-updates-dialog.patch         \
   gnu/packages/patches/cdparanoia-fpic.patch                   \
@@ -406,6 +411,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch  \
   gnu/packages/patches/cpio-gets-undeclared.patch              \
   gnu/packages/patches/cpufrequtils-fix-aclocal.patch          \
+  gnu/packages/patches/crda-optional-gcrypt.patch              \
   gnu/packages/patches/crossmap-allow-system-pysam.patch       \
   gnu/packages/patches/cssc-gets-undeclared.patch               \
   gnu/packages/patches/cssc-missing-include.patch               \
@@ -464,22 +470,8 @@ dist_patch_DATA =                                          \
   gnu/packages/patches/hwloc-gather-topology-lstopo.patch      \
   gnu/packages/patches/hydra-automake-1.15.patch               \
   gnu/packages/patches/hydra-disable-darcs-test.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2722-pt1.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2722-pt2.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2724-pt2.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2724-pt3.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2724-pt4.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2728-pt1.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2728-pt2.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2733-pt1.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2733-pt2.patch          \
-  gnu/packages/patches/icecat-CVE-2015-2735.patch              \
-  gnu/packages/patches/icecat-CVE-2015-2736.patch              \
-  gnu/packages/patches/icecat-CVE-2015-2738.patch              \
-  gnu/packages/patches/icecat-CVE-2015-2739.patch              \
-  gnu/packages/patches/icecat-CVE-2015-2740.patch              \
-  gnu/packages/patches/icecat-CVE-2015-2743.patch              \
+  gnu/packages/patches/icecat-enable-acceleration-and-webgl.patch \
+  gnu/packages/patches/icecat-freetype-2.6.patch               \
   gnu/packages/patches/icecat-libvpx-1.4.patch                 \
   gnu/packages/patches/irrlicht-mesa-10.patch                  \
   gnu/packages/patches/jbig2dec-ignore-testtest.patch          \
@@ -547,6 +539,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/ngircd-handle-zombies.patch             \
   gnu/packages/patches/ngircd-no-dns-in-tests.patch            \
   gnu/packages/patches/ninja-tests.patch                       \
+  gnu/packages/patches/ninja-zero-mtime.patch                  \
   gnu/packages/patches/nss-pkgconfig.patch                     \
   gnu/packages/patches/nvi-assume-preserve-path.patch          \
   gnu/packages/patches/nvi-dbpagesize-binpower.patch           \
@@ -632,6 +625,11 @@ dist_patch_DATA =                                          \
   gnu/packages/patches/unzip-CVE-2014-8139.patch               \
   gnu/packages/patches/unzip-CVE-2014-8140.patch               \
   gnu/packages/patches/unzip-CVE-2014-8141.patch               \
+  gnu/packages/patches/unzip-CVE-2014-9636.patch               \
+  gnu/packages/patches/unzip-allow-greater-hostver-values.patch        \
+  gnu/packages/patches/unzip-increase-size-of-cfactorstr.patch \
+  gnu/packages/patches/unzip-initialize-symlink-flag.patch     \
+  gnu/packages/patches/unzip-remove-build-date.patch           \
   gnu/packages/patches/util-linux-tests.patch                  \
   gnu/packages/patches/upower-builddir.patch                   \
   gnu/packages/patches/valgrind-glibc-2.21.patch               \