Merge branch 'master' into closure-size

pkgs/tools/admin/awscli/default.nix

@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, pythonPackages, groff }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "awscli-${version}";
-  version = "1.7.47";
-  namePrefix = "";
-
-  src = fetchFromGitHub {
-    owner = "aws";
-    repo = "aws-cli";
-    rev = version;
-    sha256 = "1955y1ar2mqzqgfngpwp8pc78wphh1qdgwwy0gs6i352jaqzkvwi";
-  };
-
-  propagatedBuildInputs = [
-    pythonPackages.botocore_1_1_10
-    pythonPackages.bcdoc
-    pythonPackages.six
-    pythonPackages.colorama
-    pythonPackages.docutils
-    pythonPackages.rsa
-    pythonPackages.pyasn1
-    groff
-  ];
-
-  postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
-    mkdir -p $out/share/zsh/site-functions
-    mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
-    rm $out/bin/aws.cmd
-  '';
-
-  meta = {
-    homepage = https://aws.amazon.com/cli/;
-    description = "Unified tool to manage your AWS services";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ muflax ];
-  };
-}

pkgs/tools/admin/letsencrypt/default.nix

@@ -1,27 +1,13 @@
 { stdenv, pythonPackages, fetchurl, dialog }:
 
-let
+pythonPackages.buildPythonPackage rec {
+  version = "0.1.0";
+  name = "letsencrypt-${version}";
+
   src = fetchurl {
     url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz";
-    sha256 = "00p94pmli4lr5l3vqi11374p9jxiqir1ygx89zgfm4db47srx41z";
+    sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw";
   };
-  version = "0.0.0.dev20151123";
-  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

pkgs/tools/admin/simp_le/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "simp_le-20151205";
+
+  src = fetchFromGitHub {
+    owner = "kuba";
+    repo = "simp_le";
+    rev = "976a33830759e66610970f92f6ec1a656a2c8335";
+    sha256 = "0bfa5081rmjjg9sii6pn2dskd1wh0dgrf9ic9hpisawrk0y0739i";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ acme cryptography pytz requests2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kuba/simp_le;
+    description = "Simple Let's Encrypt client";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ gebner ];
+    platforms = platforms.all;
+  };
+}