From 865abfa6091515da3c776283500e45d489ed488f Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sat, 19 May 2018 00:52:41 +0300 Subject: [PATCH 1/5] wireguard: Enable tools on other platforms Wireguard is now split into two pretty much independent packages: `wireguard` (Linux-specific kernel module) and `wireguard-tools`, which is cross-platform. --- .../modules/services/networking/wireguard.nix | 4 +- pkgs/os-specific/linux/wireguard/default.nix | 76 +++++-------------- .../networking/wireguard-tools/default.nix | 46 +++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 71 insertions(+), 57 deletions(-) create mode 100644 pkgs/tools/networking/wireguard-tools/default.nix diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 0591917c742..acb4778d848 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -193,7 +193,7 @@ let after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; - path = with pkgs; [ kmod iproute wireguard ]; + path = with pkgs; [ kmod iproute wireguard-tools ]; serviceConfig = { Type = "oneshot"; @@ -279,7 +279,7 @@ in config = mkIf (cfg.interfaces != {}) { boot.extraModulePackages = [ kernel.wireguard ]; - environment.systemPackages = [ pkgs.wireguard ]; + environment.systemPackages = [ pkgs.wireguard-tools ]; systemd.services = mapAttrs' generateUnit cfg.interfaces; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c5daaabd5be..c82831782e9 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, libmnl, kernel ? null }: +{ stdenv, fetchurl, kernel }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements -assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; +assert stdenv.lib.versionAtLeast kernel.version "3.10"; -let +stdenv.mkDerivation rec { name = "wireguard-${version}"; - version = "0.0.20180514"; src = fetchurl { @@ -13,61 +12,28 @@ let sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8"; }; + preConfigure = '' + cd src + sed -i '/depmod/,+1d' Makefile + ''; + + hardeningDisable = [ "pic" ]; + + KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + INSTALL_MOD_PATH = "\${out}"; + + NIX_CFLAGS = ["-Wno-error=cpp"]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildPhase = "make module"; + meta = with stdenv.lib; { homepage = https://www.wireguard.com/; downloadPage = https://git.zx2c4.com/WireGuard/refs/; - description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security"; + description = " Tools for the WireGuard secure network tunnel"; maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; license = licenses.gpl2; platforms = platforms.linux; }; - - module = stdenv.mkDerivation { - inherit src meta name; - - preConfigure = '' - cd src - sed -i '/depmod/,+1d' Makefile - ''; - - hardeningDisable = [ "pic" ]; - - KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - - NIX_CFLAGS = ["-Wno-error=cpp"]; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildPhase = "make module"; - }; - - tools = stdenv.mkDerivation { - inherit src meta name; - - preConfigure = "cd src"; - - buildInputs = [ libmnl ]; - - enableParallelBuilding = true; - - makeFlags = [ - "WITH_BASHCOMPLETION=yes" - "WITH_WGQUICK=yes" - "WITH_SYSTEMDUNITS=yes" - "DESTDIR=$(out)" - "PREFIX=/" - "-C" "tools" - ]; - - buildPhase = "make tools"; - - postInstall = '' - substituteInPlace $out/lib/systemd/system/wg-quick@.service \ - --replace /usr/bin $out/bin - ''; - }; - -in if kernel == null - then tools - else module +} diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix new file mode 100644 index 00000000000..8f983082a80 --- /dev/null +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, fetchurl, libmnl, useSystemd ? stdenv.isLinux }: + +let + inherit (lib) optional optionalString; +in + +stdenv.mkDerivation rec { + name = "wireguard-tools-${version}"; + version = "0.0.20180514"; + + src = fetchurl { + url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; + sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8"; + }; + + preConfigure = "cd src"; + + buildInputs = optional stdenv.isLinux libmnl; + + enableParallelBuilding = true; + + makeFlags = [ + "WITH_BASHCOMPLETION=yes" + "WITH_WGQUICK=yes" + "WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}" + "DESTDIR=$(out)" + "PREFIX=/" + "-C" "tools" + ]; + + buildPhase = "make tools"; + + postInstall = optionalString useSystemd '' + substituteInPlace $out/lib/systemd/system/wg-quick@.service \ + --replace /usr/bin $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://www.wireguard.com/; + downloadPage = https://git.zx2c4.com/WireGuard/refs/; + description = " Tools for the WireGuard secure network tunnel"; + maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7290f39927d..3faf3c346e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5500,6 +5500,8 @@ with pkgs; whois = callPackage ../tools/networking/whois { }; + wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; + woff2 = callPackage ../development/web/woff2 { }; woof = callPackage ../tools/misc/woof { }; From a9defaefabd20cf92ee6844972b9068e18f002ac Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 19 May 2018 12:27:21 +0300 Subject: [PATCH 2/5] top-level: remove wireguard attr --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3faf3c346e7..17bed306166 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18544,8 +18544,6 @@ with pkgs; erlang = erlangR18; }; - wireguard = callPackage ../os-specific/linux/wireguard { }; - alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; wllvm = callPackage ../development/tools/wllvm { }; From 60d96d7786b852b3406a51bec8da4546e704a157 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 19 May 2018 12:28:38 +0300 Subject: [PATCH 3/5] top-level/aliases: add wireguard -> wireguard-tools alias --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 34906533a0a..101f4989b31 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -228,6 +228,7 @@ mapAliases (rec { vorbisTools = vorbis-tools; # added 2016-01-26 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 + wireguard = wireguard-tools; # added 2018-05-19 x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 From 95cf07fc95d869c433ad96aaaca5a09f1065c97e Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sat, 19 May 2018 13:08:04 +0300 Subject: [PATCH 4/5] wireguard: use fetchzip instead of fetchurl Because cgit snapshots are not deterministic. --- pkgs/os-specific/linux/wireguard/default.nix | 6 +++--- pkgs/tools/networking/wireguard-tools/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c82831782e9..a62fce5cd61 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchzip, kernel }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { name = "wireguard-${version}"; version = "0.0.20180514"; - src = fetchurl { + src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8"; + sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj"; }; preConfigure = '' diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 8f983082a80..f34119893c4 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libmnl, useSystemd ? stdenv.isLinux }: +{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }: let inherit (lib) optional optionalString; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; version = "0.0.20180514"; - src = fetchurl { + src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8"; + sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj"; }; preConfigure = "cd src"; From f8ed43e600228ab415866d4938703fa5eaa7b121 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 19 May 2018 17:20:33 +0300 Subject: [PATCH 5/5] wireguard: use src from wireguard-tools --- pkgs/os-specific/linux/wireguard/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index a62fce5cd61..ae31edcaaed 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel }: +{ stdenv, fetchzip, kernel, wireguard-tools }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -7,10 +7,7 @@ stdenv.mkDerivation rec { name = "wireguard-${version}"; version = "0.0.20180514"; - src = fetchzip { - url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj"; - }; + inherit (wireguard-tools) src; preConfigure = '' cd src