Merge pull request #167325 from aaronjheng/wireguard-go

wireguard-go: 0.0.20210424 -> 0.0.20220316

pkgs/tools/networking/wireguard-go/default.nix

@@ -1,25 +1,33 @@
-{ lib, buildGoPackage, fetchzip }:
+{ lib, buildGoModule, fetchzip, testers, wireguard-go }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "wireguard-go";
-  version = "0.0.20210424";
-
-  goPackagePath = "golang.zx2c4.com/wireguard";
+  version = "0.0.20220316";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "RUUueSsfEi1H+ckrnPKqbVlWONhCplMMftlyAmwK+ss=";
+    sha256 = "sha256-OQiG92idGwOXWX4H4HNmk2dmRM2+GtssJFzavhj1HxM=";
   };
 
-  goDeps = ./deps.nix;
+  postPatch = ''
+    # Skip formatting tests
+    rm -f format_test.go
+  '';
+
+  vendorSha256 = "sha256-MrHkOj0YfvAm8zOowXzl23F1NPTCO0F8vMMGT/Y+nQ0=";
 
-  passthru.updateScript = ./update.sh;
+  subPackages = [ "." ];
+
+  ldflags = [ "-s" "-w" ];
 
   postInstall = ''
     mv $out/bin/wireguard $out/bin/wireguard-go
   '';
 
-  doCheck = true;
+  passthru.tests.version = testers.testVersion {
+    package = wireguard-go;
+    version = "v${version}";
+  };
 
   meta = with lib; {
     description = "Userspace Go implementation of WireGuard";

pkgs/tools/networking/wireguard-go/update.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused common-updater-scripts vgo2nix
-
-set -eu -o pipefail
-
-basedir="$(git rev-parse --show-toplevel)"
-version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\tgo\t\([^\t]\+\)\t.*/\1/p')"
-update-source-version wireguard-go "$version"
-
-vgo2nix -dir $(nix-build -A wireguard-go.src) -outfile "$basedir/pkgs/tools/networking/wireguard-go/deps.nix"
-
-if [[ -f "$basedir/wireguard-go.log" ]];then
-    rm "$basedir/wireguard-go.log"
-fi

pkgs/top-level/all-packages.nix

@@ -11754,7 +11754,9 @@ with pkgs;
 
   wipe = callPackage ../tools/security/wipe { };
 
-  wireguard-go = callPackage ../tools/networking/wireguard-go { };
+  wireguard-go = callPackage ../tools/networking/wireguard-go {
+    buildGoModule = buildGo118Module;
+  };
 
   wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { };