Merge pull request #133763 from efim/wireguard-SoN

pkgs/os-specific/linux/wireguard/default.nix

@@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     inherit (wireguard-tools.meta) homepage license maintainers;
     description = "Kernel module for the WireGuard secure network tunnel";
+    longDescription = ''
+      Backport of WireGuard for kernels 3.10 to 5.5, as an out of tree module.
+      (as WireGuard was merged into the Linux kernel for 5.6)
+    '';
     downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/";
     platforms = platforms.linux;
   };

pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch

@@ -1,26 +0,0 @@
-From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Sun, 5 Jan 2020 15:35:15 +0100
-Subject: [PATCH] Fix darwin build
-
----
- rwcancel/select_default.go | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go
-index dd23cda..03f3452 100644
---- a/rwcancel/select_default.go
-+++ b/rwcancel/select_default.go
-@@ -9,6 +9,7 @@ package rwcancel
- 
- import "golang.org/x/sys/unix"
- 
--func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error {
--	return unix.Select(nfd, r, w, e, timeout)
-+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) {
-+	_, err = unix.Select(nfd, r, w, e, timeout)
-+	return
- }
--- 
-2.23.1
-

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

@@ -2,17 +2,15 @@
 
 buildGoPackage rec {
   pname = "wireguard-go";
-  version = "0.0.20200320";
+  version = "0.0.20210424";
 
   goPackagePath = "golang.zx2c4.com/wireguard";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r";
+    sha256 = "RUUueSsfEi1H+ckrnPKqbVlWONhCplMMftlyAmwK+ss=";
   };
 
-  patches = [ ./0001-Fix-darwin-build.patch ];
-
   goDeps = ./deps.nix;
 
   passthru.updateScript = ./update.sh;
@@ -21,10 +19,12 @@ buildGoPackage rec {
     mv $out/bin/wireguard $out/bin/wireguard-go
   '';
 
+  doCheck = true;
+
   meta = with lib; {
     description = "Userspace Go implementation of WireGuard";
     homepage = "https://git.zx2c4.com/wireguard-go/about/";
-    license = licenses.gpl2;
+    license = licenses.mit;
     maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ];
   };
 }

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

@@ -53,6 +53,13 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Tools for the WireGuard secure network tunnel";
+    longDescription = ''
+      Supplies the main userspace tooling for using and configuring WireGuard tunnels, including the wg(8) and wg-quick(8) utilities.
+      - wg : the configuration utility for getting and setting the configuration of WireGuard tunnel interfaces. The interfaces
+        themselves can be added and removed using ip-link(8) and their IP addresses and routing tables can be set using ip-address(8)
+        and ip-route(8). The wg utility provides a series of sub-commands for changing WireGuard-specific aspects of WireGuard interfaces.
+      - wg-quick : an extremely simple script for easily bringing up a WireGuard interface, suitable for a few common use cases.
+    '';
     downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
     homepage = "https://www.wireguard.com/";
     license = licenses.gpl2;