diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-09 17:02:08 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-09 17:02:08 +0100 |
| commit | 64461ba20a07a0cf3197de3e97cb44e0f66cebdc (patch) | |
| tree | f48fd8e66879da30d5e2d89b16de6294ecd1192d /gnu/local.mk | |
| parent | 55174e668f2985d1c4efda4fbf58f4061dde0db2 (diff) | |
| parent | cee9ab244f9ba9f3156b6aa50927418bae951096 (diff) | |
| download | guix-64461ba20a07a0cf3197de3e97cb44e0f66cebdc.tar guix-64461ba20a07a0cf3197de3e97cb44e0f66cebdc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 90dbe94025..545a7d173f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -813,6 +813,7 @@ dist_patch_DATA = \ %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ + %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.patch \ @@ -1230,7 +1231,6 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ - %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ %D%/packages/patches/x265-detect512-all-arches.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ |