diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:25:56 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:25:56 +0100 |
commit | bfa5af85b733defd158965fe91d60fd3f7a8a666 (patch) | |
tree | a557cb0f3f1a293f215f83d3589ce556ca5a30c3 /pkgs/os-specific/linux | |
parent | 1156a04c7ffd6ceca695b0e327911f9405a09fb6 (diff) | |
parent | 548c6708a62da8064abcdf0968f2f32c2cfbef0e (diff) | |
download | nixpkgs-bfa5af85b733defd158965fe91d60fd3f7a8a666.tar nixpkgs-bfa5af85b733defd158965fe91d60fd3f7a8a666.tar.gz nixpkgs-bfa5af85b733defd158965fe91d60fd3f7a8a666.tar.bz2 nixpkgs-bfa5af85b733defd158965fe91d60fd3f7a8a666.tar.lz nixpkgs-bfa5af85b733defd158965fe91d60fd3f7a8a666.tar.xz nixpkgs-bfa5af85b733defd158965fe91d60fd3f7a8a666.tar.zst nixpkgs-bfa5af85b733defd158965fe91d60fd3f7a8a666.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a7d1d7e175b..aa6f29f374a 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17151"; + rev = "17153"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c2dca669616..eefa03d91cd 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,11 +1,18 @@ -{ stdenv, kernel, wireguard-tools, perl }: +{ stdenv, fetchzip, kernel, perl, wireguard-tools }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; +# wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html +assert stdenv.lib.versionOlder kernel.version "5.6"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wireguard"; - inherit (wireguard-tools) src version; + version = "0.0.20191226"; + + src = fetchzip { + url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; + sha256 = "1q618h385kqnzxa8xswnw9i1yqrlnl3fglkhbzc8w1181qr4fhra"; + }; preConfigure = '' cd src @@ -27,6 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers; description = "Kernel module for the WireGuard secure network tunnel"; + downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/"; platforms = platforms.linux; }; } |