diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-10-01 11:49:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-01 12:06:00 +0200 |
| commit | 0cf2b6f2dbcd299f7a4b7a563cf34ae5de154b15 (patch) | |
| tree | 0b653bb411222fda1d159cb05bee722ff8bac9cc /gnu/local.mk | |
| parent | 8d564b8b81b98fec9aac2f5f2d3cb0d1f2ea1416 (diff) | |
| parent | 717b6ba6aa9ac876b2c2df36096e4579b19ee06c (diff) | |
| download | guix-0cf2b6f2dbcd299f7a4b7a563cf34ae5de154b15.tar guix-0cf2b6f2dbcd299f7a4b7a563cf34ae5de154b15.tar.gz | |
Merge branch 'master' into core-updates
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 18a25e6bc7..9f8ce842b6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -674,6 +674,7 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ + %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ %D%/packages/patches/adb-add-libraries.patch \ @@ -764,7 +765,6 @@ dist_patch_DATA = \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ - %D%/packages/patches/dealii-mpi-deprecations.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ @@ -1098,7 +1098,6 @@ dist_patch_DATA = \ %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ - %D%/packages/patches/mame-rapidjson-fix.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ |