diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:50:19 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:50:19 +0200 |
| commit | 23744435613aa040beacc61a0825cc72280da80a (patch) | |
| tree | 8bdff27c5b3dc088d923e91a14a38f6a6b9fa661 /gnu/local.mk | |
| parent | 0057027f81a7efed76f9bd983bc827ae1b66d9cf (diff) | |
| parent | 7e463dd16b7e273011f0beafa57a89fa2d525f8b (diff) | |
| download | guix-23744435613aa040beacc61a0825cc72280da80a.tar.gz | |
Merge branch 'staging' into wip-lisp
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 303f0d75f3..ba94adfe72 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -894,7 +894,6 @@ dist_patch_DATA = \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ - %D%/packages/patches/dconf-meson-0.52.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/dee-vapi.patch \ @@ -1155,8 +1154,11 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ + %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \ + %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \ + %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \ %D%/packages/patches/jamvm-2.0.0-disable-branch-patching.patch \ - %D%/packages/patches/jamvm-arm.patch \ + %D%/packages/patches/jamvm-2.0.0-opcode-guard.patch \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ @@ -1219,7 +1221,6 @@ dist_patch_DATA = \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ - %D%/packages/patches/libdrm-realpath-virtio.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ |