diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-26 23:31:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-26 23:31:04 +0100 |
| commit | 763a401ed185d39119289c670c1eb250ace13ed9 (patch) | |
| tree | 20c989b7c6d571e388e1707af275a946b7757ecb /gnu-system.am | |
| parent | 94264407815da63c5f07a519cd41838e35ab464e (diff) | |
| parent | bf7688fe4d8624ed9bddc8f7f3887df5f1fc3957 (diff) | |
| download | guix-763a401ed185d39119289c670c1eb250ace13ed9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index f1ebe40703..0e912f280e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/freeipmi.scm \ gnu/packages/ftp.scm \ gnu/packages/fribidi.scm \ + gnu/packages/game-development.scm \ gnu/packages/games.scm \ gnu/packages/gawk.scm \ gnu/packages/gcal.scm \ @@ -377,6 +378,15 @@ dist_patch_DATA = \ gnu/packages/patches/guix-test-networking.patch \ gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \ gnu/packages/patches/hop-bigloo-4.0b.patch \ + gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch \ + gnu/packages/patches/icecat-CVE-2014-1587-bug-1072847.patch \ + gnu/packages/patches/icecat-CVE-2014-1587-bug-1079729.patch \ + gnu/packages/patches/icecat-CVE-2014-1587-bug-1080312.patch \ + gnu/packages/patches/icecat-CVE-2014-1587-bug-1089207.patch \ + gnu/packages/patches/icecat-CVE-2014-1590.patch \ + gnu/packages/patches/icecat-CVE-2014-1592.patch \ + gnu/packages/patches/icecat-CVE-2014-1593.patch \ + gnu/packages/patches/icecat-CVE-2014-1594.patch \ gnu/packages/patches/inkscape-stray-comma.patch \ gnu/packages/patches/jbig2dec-ignore-testtest.patch \ gnu/packages/patches/kmod-module-directory.patch \ @@ -450,6 +460,7 @@ dist_patch_DATA = \ gnu/packages/patches/wmctrl-64-fix.patch \ gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch \ gnu/packages/patches/xf86-video-openchrome-includes.patch \ + gnu/packages/patches/xfce4-panel-plugins.patch \ gnu/packages/patches/xmodmap-asprintf.patch bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap |