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

Merge pull request #76578 from xwvvvvwx/wireguard-tools-1.0.20191226

Browse Source 
wireguard-tools 1.0.20191226 / wireguard 0.0.20191226
This commit is contained in:
Maximilian Bosch 2019-12-30 12:22:37 +01:00 committed by GitHub
commit 646c641358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert stdenv.lib.versionAtLeast kernel.version "3.10"; 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"; 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 = '' preConfigure = ''
cd src cd src
@ -27,6 +34,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit (wireguard-tools.meta) homepage license maintainers; inherit (wireguard-tools.meta) homepage license maintainers;
description = "Kernel module for the WireGuard secure network tunnel"; description = "Kernel module for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/";
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

12
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -14,14 +14,14 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wireguard-tools"; pname = "wireguard-tools";
version = "0.0.20191219"; version = "1.0.20191226";
src = fetchzip { src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
sha256 = "1qxpjvj3927xdly022rp2sndbifmr0c2y6ik77v43k95ch94716d"; sha256 = "14v5asdjazz0p3bhg8na9w6y66i3jhnn8imxhq8xlix1k4n93l4z";
}; };
sourceRoot = "source/src/tools"; sourceRoot = "source/src";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = optional stdenv.isLinux libmnl; buildInputs = optional stdenv.isLinux libmnl;
@ -51,10 +51,10 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Tools for the WireGuard secure network tunnel"; description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/WireGuard/refs/"; downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/"; homepage = "https://www.wireguard.com/";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ]; maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }