diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-27 12:33:53 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-27 12:33:53 +0200 |
| commit | 6611cabd1c3791c79ce2ff701eaf758ceacd9119 (patch) | |
| tree | ef2a8d483dfee9d65f61b386194bba4fbc69d58a /gnu/local.mk | |
| parent | 7aad4a99f790e256ef03bcf4c6a619560ae48075 (diff) | |
| parent | 25d59733a52075fe802b7928fdaa2f236814cd15 (diff) | |
| download | guix-patches-6611cabd1c3791c79ce2ff701eaf758ceacd9119.tar guix-patches-6611cabd1c3791c79ce2ff701eaf758ceacd9119.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 2bcf966101..33b8194dc1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1018,8 +1018,7 @@ dist_patch_DATA = \ %D%/packages/patches/ecl-16-libffi.patch \ %D%/packages/patches/efibootmgr-remove-extra-decl.patch \ %D%/packages/patches/efivar-211.patch \ - %D%/packages/patches/eigen-remove-openmp-error-counting.patch \ - %D%/packages/patches/eigen-stabilise-sparseqr-test.patch \ + %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-path-length.patch \ @@ -1632,8 +1631,8 @@ dist_patch_DATA = \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ - %D%/packages/patches/php-bug-74093-test.patch \ - %D%/packages/patches/php-openssl_x509_checkpurpose_basic.patch \ + %D%/packages/patches/php-bug-74093-test.patch \ + %D%/packages/patches/php-curl-compat.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ |