git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #76578 from xwvvvvwx/wireguard-tools-1.0.20191226

wireguard-tools 1.0.20191226 / wireguard 0.0.20191226

commit646c641358de1c0856bfe46e369c45fd5a8fd617 authorMaximilian Bosch <maximilian@mbosch.me> dateMon 30 Dec 2019, 12:22 (7 years ago) parent4c28daad6be252
2 files changed+17−9
pkgs/os-specific/linux/wireguard/default.nix+11−3 pkgs/tools/networking/wireguard-tools/default.nix+6−6
pkgs/os-specific/linux/wireguard/default.nix+11−3
@@ -1,11 +1,18 @@
1−{ stdenv, kernel, wireguard-tools, perl }:
1+{ stdenv, fetchzip, kernel, perl, wireguard-tools }:
22
33# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
44assert stdenv.lib.versionAtLeast kernel.version "3.10";
5+# wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html
6+assert stdenv.lib.versionOlder kernel.version "5.6";
57
6−stdenv.mkDerivation {
8+stdenv.mkDerivation rec {
79 pname = "wireguard";
8− inherit (wireguard-tools) src version;
10+ version = "0.0.20191226";
11+
12+ src = fetchzip {
13+ url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
14+ sha256 = "1q618h385kqnzxa8xswnw9i1yqrlnl3fglkhbzc8w1181qr4fhra";
15+ };
916
1017 preConfigure = ''
1118 cd src
@@ -27,6 +34,7 @@ stdenv.mkDerivation {
2734 meta = with stdenv.lib; {
2835 inherit (wireguard-tools.meta) homepage license maintainers;
2936 description = "Kernel module for the WireGuard secure network tunnel";
37+ downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/";
3038 platforms = platforms.linux;
3139 };
3240}
pkgs/tools/networking/wireguard-tools/default.nix+6−6
@@ -14,14 +14,14 @@ with stdenv.lib;
1414
1515stdenv.mkDerivation rec {
1616 pname = "wireguard-tools";
17− version = "0.0.20191219";
17+ version = "1.0.20191226";
1818
1919 src = fetchzip {
20− url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
21− sha256 = "1qxpjvj3927xdly022rp2sndbifmr0c2y6ik77v43k95ch94716d";
20+ url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
21+ sha256 = "14v5asdjazz0p3bhg8na9w6y66i3jhnn8imxhq8xlix1k4n93l4z";
2222 };
2323
24− sourceRoot = "source/src/tools";
24+ sourceRoot = "source/src";
2525
2626 nativeBuildInputs = [ makeWrapper ];
2727 buildInputs = optional stdenv.isLinux libmnl;
@@ -51,10 +51,10 @@ stdenv.mkDerivation rec {
5151
5252 meta = {
5353 description = "Tools for the WireGuard secure network tunnel";
54− downloadPage = "https://git.zx2c4.com/WireGuard/refs/";
54+ downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
5555 homepage = "https://www.wireguard.com/";
5656 license = licenses.gpl2;
57− maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ];
57+ maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ];
5858 platforms = platforms.unix;
5959 };
6060}