public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103600 from erictapen/wireguard-linux-compat-20201112 

linuxPackages.wireguard: 1.0.20200908 -> 1.0.20201112
This commit is contained in:
Maximilian Bosch 2020-11-12 16:18:29 +01:00 committed by GitHub
parent cc8a3b44e7 6b9f23267e
commit e07fcb95b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -7,17 +7,13 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wireguard"; pname = "wireguard";
version = "1.0.20200908"; version = "1.0.20201112";
src = fetchzip { src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; 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" ]; hardeningDisable = [ "pic" ];
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

12
pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
View File

@ -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