Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

pkgs/tools/admin/awscli/default.nix

@@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    pythonPackages.botocore
+    pythonPackages.botocore_1_1_10
     pythonPackages.bcdoc
     pythonPackages.six
     pythonPackages.colorama

pkgs/tools/admin/google-cloud-sdk/default.nix

@@ -1,12 +1,12 @@
 {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  version = "0.9.74";
+  version = "0.9.82";
   name = "google-cloud-sdk-${version}";
 
   src = fetchurl {
-    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150817103450.tar.gz";
-    sha256 = "0qdry40xk23c6dvr6qzqn23bg8yfflm1m00gw1mqnpr4m1425vfg";
+    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20151008123015.tar.gz";
+    sha256 = "11gnhgjj4y4dzi3wfdpnz918m7xraz1k3ady1d6y446hmc5q2512";
   };
 
   buildInputs = [python27 makeWrapper];

pkgs/tools/admin/letsencrypt/default.nix

@@ -0,0 +1,50 @@
+{ stdenv, pythonPackages, fetchurl, dialog }:
+
+let
+  src = fetchurl {
+    url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz";
+    sha256 = "1xr1ii2kfbhspyirwyqlk4vyx88irif92mw02jwfx9mnslk9gral";
+  };
+  version = "0.0.0.dev20151030";
+  acme = pythonPackages.buildPythonPackage rec {
+    name = "acme-${version}";
+    inherit src version;
+
+    propagatedBuildInputs = with pythonPackages; [
+      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
+      ndg-httpsclient
+    ];
+
+    buildInputs = with pythonPackages; [ nose ];
+
+    sourceRoot = "letsencrypt-${version}/acme";
+  };
+in pythonPackages.buildPythonPackage rec {
+  name = "letsencrypt-${version}";
+  inherit src version;
+
+  propagatedBuildInputs = with pythonPackages; [
+    zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme
+    cryptography configobj pyRFC3339 python2-pythondialog parsedatetime ConfigArgParse
+  ];
+  buildInputs = with pythonPackages; [ nose dialog ];
+
+  patchPhase = ''
+    substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
+  '';
+
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH" \
+                       --prefix PATH : "${dialog}/bin:$PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/letsencrypt/letsencrypt;
+    description = "ACME client that can obtain certs and extensibly update server configurations";
+    platforms = platforms.unix;
+    maintainers = [ maintainers.iElectric ];
+    license = licenses.asl20;
+  };
+}