diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-19 15:24:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-19 15:24:59 +0200 |
| commit | a7bc1588e6b8ad4a890d9cc884016f36f92f2e7d (patch) | |
| tree | 284cc0af9edb74bfafad70b5a6fac9ad8b07b532 /gnu/local.mk | |
| parent | 8a502c3b60fdd5d8ee0b08e1c9d4c0d7fedc2fda (diff) | |
| parent | df570bf271536399993b39e7ea2ea0452bb6cde4 (diff) | |
| download | guix-a7bc1588e6b8ad4a890d9cc884016f36f92f2e7d.tar guix-a7bc1588e6b8ad4a890d9cc884016f36f92f2e7d.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 7270560573..5789a872de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -934,6 +934,7 @@ dist_patch_DATA = \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-gcc-ice.patch \ + %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ @@ -990,7 +991,6 @@ dist_patch_DATA = \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ - %D%/packages/patches/openblas-fix-tests-i686.patch \ %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ @@ -1051,7 +1051,6 @@ dist_patch_DATA = \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ - %D%/packages/patches/pulseaudio-glibc-2.27.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pybugz-encode-error.patch \ %D%/packages/patches/pybugz-stty.patch \ |