diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-07-13 23:44:55 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-07-13 23:44:55 +0200 |
| commit | c3cf9d36e40713212ffc9d75aa2324ab7bad4f9b (patch) | |
| tree | 1d04f8c542b78e1510a8d29163e578fe2538d81e /gnu-system.am | |
| parent | 314a83ef1e80b47b44debc1118e38d7f761e0e7f (diff) | |
| parent | ca9ea1a849d685db46adcb92449dff36427c48bd (diff) | |
| download | gnu-guix-c3cf9d36e40713212ffc9d75aa2324ab7bad4f9b.tar gnu-guix-c3cf9d36e40713212ffc9d75aa2324ab7bad4f9b.tar.gz | |
Merge branch 'bug-17853'
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 6da2d99812..22bb4ef70d 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -304,8 +304,8 @@ dist_patch_DATA = \ gnu/packages/patches/gd-mips64-deplibs-fix.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ - gnu/packages/patches/glib-tests-newnet.patch \ gnu/packages/patches/glib-tests-prlimit.patch \ + gnu/packages/patches/glib-tests-timer.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/gnunet-fix-scheduler.patch \ @@ -325,6 +325,7 @@ dist_patch_DATA = \ gnu/packages/patches/icu4c-test-date-format.patch \ gnu/packages/patches/inkscape-stray-comma.patch \ 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 \ |