Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-12-30 16:25:56 +01:00
11 changed files with 92 additions and 27 deletions

View File

@@ -14,14 +14,14 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "0.0.20191219";
version = "1.0.20191226";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1qxpjvj3927xdly022rp2sndbifmr0c2y6ik77v43k95ch94716d";
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
sha256 = "14v5asdjazz0p3bhg8na9w6y66i3jhnn8imxhq8xlix1k4n93l4z";
};
sourceRoot = "source/src/tools";
sourceRoot = "source/src";
nativeBuildInputs = [ makeWrapper ];
buildInputs = optional stdenv.isLinux libmnl;
@@ -51,10 +51,10 @@ stdenv.mkDerivation rec {
meta = {
description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/WireGuard/refs/";
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/";
license = licenses.gpl2;
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ];
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ];
platforms = platforms.unix;
};
}