diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-20 13:37:58 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-20 13:37:58 +0200 |
| commit | 2817ac3c18c1b1a6291c052bc61edd0947890a82 (patch) | |
| tree | 9985705b35274ae1d6655be789346a98beff63de /gnu/local.mk | |
| parent | ecd13016517f0113016fef090782b725fd5e80ce (diff) | |
| parent | 3e12df7d71547b4eca718b6b0e1fc244722dcc39 (diff) | |
| download | guix-2817ac3c18c1b1a6291c052bc61edd0947890a82.tar guix-2817ac3c18c1b1a6291c052bc61edd0947890a82.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 6a48782e4b..c10894cb5d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1012,7 +1012,7 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ %D%/packages/patches/openssl-runpath.patch \ - %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ + %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ @@ -1231,7 +1231,6 @@ dist_patch_DATA = \ %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ - %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ %D%/packages/patches/xf86-video-i128-remove-mibstore.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ |