diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-22 23:06:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-22 23:06:33 +0200 |
| commit | f07aa672fddd7b5405fc730ffebcda67daa71ae1 (patch) | |
| tree | 52b2a3f246f5022ef7eaa7e20cb9aac067e10d05 /gnu-system.am | |
| parent | 52ac153e2a83035ce2bc875f9c414cb26db5f6fc (diff) | |
| parent | dd68dd137a4a70cde7e344bd969ef7849355d018 (diff) | |
| download | gnu-guix-f07aa672fddd7b5405fc730ffebcda67daa71ae1.tar gnu-guix-f07aa672fddd7b5405fc730ffebcda67daa71ae1.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index 8f8ce4003d..67b13e7803 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -311,7 +311,6 @@ dist_patch_DATA = \ gnu/packages/patches/clucene-pkgconfig.patch \ gnu/packages/patches/cmake-fix-tests.patch \ gnu/packages/patches/coreutils-dummy-man.patch \ - gnu/packages/patches/coreutils-skip-nohup.patch \ gnu/packages/patches/cpio-gets-undeclared.patch \ gnu/packages/patches/cssc-gets-undeclared.patch \ gnu/packages/patches/cssc-missing-include.patch \ @@ -322,11 +321,13 @@ dist_patch_DATA = \ gnu/packages/patches/doxygen-tmake.patch \ gnu/packages/patches/emacs-configure-sh.patch \ gnu/packages/patches/eudev-rules-directory.patch \ + gnu/packages/patches/file-CVE-2014-3587.patch \ gnu/packages/patches/findutils-absolute-paths.patch \ gnu/packages/patches/flashrom-use-libftdi1.patch \ gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ + gnu/packages/patches/gcc-fix-pr61801.patch \ gnu/packages/patches/gd-mips64-deplibs-fix.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ @@ -354,7 +355,6 @@ dist_patch_DATA = \ gnu/packages/patches/kmod-module-directory.patch \ gnu/packages/patches/libbonobo-activation-test-race.patch \ gnu/packages/patches/libevent-dns-tests.patch \ - gnu/packages/patches/libffi-mips-n32-fix.patch \ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ gnu/packages/patches/libmad-mips-newgcc.patch \ gnu/packages/patches/libtheora-config-guess.patch \ |