From 6b9f23267e4187828e1fbd2a767f87c4e879d5bc Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 12 Nov 2020 13:09:04 +0100 Subject: [PATCH] linuxPackages.wireguard: 1.0.20200908 -> 1.0.20201112 --- pkgs/os-specific/linux/wireguard/default.nix | 8 ++------ .../linux/wireguard/linux-5.4.76-fix.patch | 12 ------------ 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index ef81dd54a73..25a59b14ab8 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,17 +7,13 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200908"; + version = "1.0.20201112"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg"; + sha256 = "sha256-HnYvjZ3VUH79NwNIvyTTygWYbVqEL2ttvlOlLiHhb5s="; }; - patches = [ - ./linux-5.4.76-fix.patch - ]; - hardeningDisable = [ "pic" ]; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch b/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch deleted file mode 100644 index 78c3365bcb3..00000000000 --- a/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h ---- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h 2020-09-08 16:22:40.000000000 +0000 -+++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h 2020-11-10 15:05:43.720093522 +0000 -@@ -40,7 +40,7 @@ - #undef pull - #endif - --#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) - #define SYM_FUNC_START ENTRY - #define SYM_FUNC_END ENDPROC - #endif