3 files changed, 29 insertions, 20 deletions
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index d18fe4eafd3..afc9b44d42f 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -47,6 +47,11 @@ in rec {
     sha256  = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59";
   };
 
-  ansible2 = ansible_2_5;
+  ansible_2_6 = generic {
+    version = "2.6.2";
+    sha256  = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl";
+  };
+
+  ansible2 = ansible_2_6;
   ansible  = ansible2;
 }
diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
index 1a85bf21b22..d01dca45959 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@@ -1,28 +1,31 @@
 { lib
-, python
+, python3
+, glibcLocales
 }:
 
-with python.pkgs;
+with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "mycli";
-  version = "1.6.0";
+  version = "1.17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qg4b62kizyb16kk0cvpk70bfs3gg4q4hj2b15nnc7a3gqqfp67j";
+    sha256 = "11d3ssjifms6bid77jk06zl5wl3srihijmv5kggxa0w2l59y8h9m";
   };
 
   propagatedBuildInputs = [
-    pymysql configobj sqlparse prompt_toolkit pygments click pycrypto
+    pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "==" ">="
-  '';
+  checkInputs = [ pytest mock glibcLocales ];
+
+  checkPhase = ''
+    export HOME=.
+    export LC_ALL="en_US.UTF-8"
 
-  # No tests in archive. Newer versions do include tests
-  doCheck = false;
+    py.test
+  '';
 
   meta = {
     inherit version;
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index ca0e16c1185..f5be7719d0d 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, pythonPackages, bash }:
- 
-pythonPackages.buildPythonApplication rec {
+{ stdenv, python3Packages, bash }:
+
+python3Packages.buildPythonApplication rec {
   pname = "simp_le-client";
-  version = "0.8.0";
+  version = "0.9.0";
 
-  src = pythonPackages.fetchPypi {
+  src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i";
+    sha256 = "1yxfznd78zkg2f657v520zj5w4dvq5n594d0kpm4lra8xnpg4zcv";
   };
 
   postPatch = ''
     # drop upper bound of acme requirement
     sed -ri "s/'(acme>=[^,]+),<[^']+'/'\1'/" setup.py
+    # drop upper bound of idna requirement
+    sed -ri "s/'(idna)<[^']+'/'\1'/" setup.py
     substituteInPlace simp_le.py \
       --replace "/bin/sh" "${bash}/bin/sh"
   '';
@@ -20,14 +22,13 @@ pythonPackages.buildPythonApplication rec {
     $out/bin/simp_le --test
   '';
 
-  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy ];
+  propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/zenhack/simp_le;
     description = "Simple Let's Encrypt client";
     license = licenses.gpl3;
     maintainers = with maintainers; [ gebner makefu ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }
-