Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-02-24 09:19:12 +01:00
265 changed files with 4145 additions and 1230 deletions

View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Wireless encryption cracking tools";
homepage = http://www.aircrack-ng.org/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ domenkozar garbas chaoflow ];
maintainers = with maintainers; [ domenkozar garbas ];
platforms = platforms.linux;
};
}

View File

@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
pname = "getmail";
version = "5.10";
version = "5.13";
src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz";
sha256 = "0qc4gp66mhaxyjj7pfz9v69kxnw76my4zw07hvc4f3kj3balkygx";
sha256 = "178a1c37z1aia5m2mbq9gyv6hylnxg9g3lp3njcrz7phfmj2zm84";
};
doCheck = false;