Merge remote-tracking branch 'origin/master' into closure-size

This commit is contained in:
Luca Bruno
2015-11-25 21:37:30 +01:00
659 changed files with 46562 additions and 13611 deletions
+2 -2
View File
@@ -3,9 +3,9 @@
let
src = fetchurl {
url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz";
sha256 = "1xr1ii2kfbhspyirwyqlk4vyx88irif92mw02jwfx9mnslk9gral";
sha256 = "00p94pmli4lr5l3vqi11374p9jxiqir1ygx89zgfm4db47srx41z";
};
version = "0.0.0.dev20151030";
version = "0.0.0.dev20151123";
acme = pythonPackages.buildPythonPackage rec {
name = "acme-${version}";
inherit src version;
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
description = "NX compression proxy";
homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
license = licenses.gpl2;
platforms = with platforms; linux;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};