aboutsummaryrefslogtreecommitdiff
path: root/gnu-system.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-07-15 16:11:13 -0400
committerMark H Weaver <mhw@netris.org>2015-07-15 16:11:13 -0400
commit368474150b0a77ff54509f6ad0533d8c5a208bac (patch)
treeeed636b07998f97afb34f831f62b5583b30d5b61 /gnu-system.am
parent35995769b516d228793940c5333ad522de992a6c (diff)
parentb76c4152530b81d7ecc1c958202a3f06d407587d (diff)
downloadguix-368474150b0a77ff54509f6ad0533d8c5a208bac.tar
guix-368474150b0a77ff54509f6ad0533d8c5a208bac.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
-rw-r--r--gnu-system.am17
1 files changed, 1 insertions, 16 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 8ee6cab573..c9c1d6e5a8 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -468,22 +468,7 @@ 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-libvpx-1.4.patch \
gnu/packages/patches/irrlicht-mesa-10.patch \
gnu/packages/patches/jbig2dec-ignore-testtest.patch \