From f96f14f69ea62f79695dc56f38b185a8eeb01808 Mon Sep 17 00:00:00 2001 From: elseym Date: Tue, 12 Mar 2019 20:06:17 +0100 Subject: [PATCH 1/2] wireguard-tools: 0.0.20190123 -> 0.0.20190227 --- pkgs/tools/networking/wireguard-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 54210469fba..0d59864154d 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20190123"; + version = "0.0.20190227"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1lyl3nmsgp9jk9js3vz032vdx7cg9ynkwzdr19wrr26pkxhpcnxr"; + sha256 = "1kaq0mjcdr4hxr3rx8z11rvlh4ycjsn5654fjw1gh1fdbjgczax5"; }; sourceRoot = "source/src/tools"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { downloadPage = https://git.zx2c4.com/WireGuard/refs/; homepage = https://www.wireguard.com/; license = licenses.gpl2; - maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; + maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 ]; platforms = platforms.unix; }; } From 2c3ab523d3fc47c2bbb1a34e09096e02be884fde Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Mar 2019 22:43:28 +0100 Subject: [PATCH 2/2] linuxPackages.wireguard: fix build Ensure that only module-related targets from the project's Makefile are built. Co-authored-by: elseym Co-authored-by: Franz Pletz --- pkgs/os-specific/linux/wireguard/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e103de3e1b7..02e08bec7ad 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies; - buildPhase = "make module"; + buildFlags = [ "module" ]; + installTargets = [ "module-install" ]; meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers;