From 9f327caa1f146cd9876bbf8a93713e65ba7452a8 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Tue, 23 Oct 2018 23:17:43 +0800
Subject: pythonPackages.sh: 1.11 -> 1.12.14

- Enable unit tests.
- Add MIT license.
---
 pkgs/top-level/python-packages.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'pkgs/top-level/python-packages.nix')

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c5870b529c1..5c525d6b63c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6729,18 +6729,25 @@ in {
 
 
   sh = buildPythonPackage rec {
-    name = "sh-1.11";
+    pname = "sh";
+    version = "1.12.14";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sh/${name}.tar.gz";
-      sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
     };
 
-    doCheck = false;
+    buildInputs = with self; [ coverage ];
+
+    # A test needs the HOME directory to be different from $TMPDIR.
+    preCheck = ''
+    HOME=$(mktemp -d)
+    '';
 
     meta = {
       description = "Python subprocess interface";
       homepage = https://pypi.python.org/pypi/sh/;
+      license = licenses.mit;
     };
   };
 
-- 
cgit 1.4.1


From 5e4fd34cfe9d8c866b6a8d8aa52d337cb032e987 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Wed, 24 Oct 2018 22:10:04 +0800
Subject: pythonPackages.sh: move to python-modules

---
 pkgs/development/python-modules/sh/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 25 +------------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/sh/default.nix

(limited to 'pkgs/top-level/python-packages.nix')

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
new file mode 100644
index 000000000000..37388bf46900
--- /dev/null
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, coverage }:
+
+buildPythonPackage rec {
+  pname = "sh";
+  version = "1.12.14";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
+  };
+
+  checkInputs = [ coverage ];
+
+  # A test needs the HOME directory to be different from $TMPDIR.
+  preCheck = ''
+    HOME=$(mktemp -d)
+  '';
+
+  meta = {
+    description = "Python subprocess interface";
+    homepage = https://pypi.python.org/pypi/sh/;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c525d6b63c6..cab23eb80604 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6727,30 +6727,7 @@ in {
     };
   };
 
-
-  sh = buildPythonPackage rec {
-    pname = "sh";
-    version = "1.12.14";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
-    };
-
-    buildInputs = with self; [ coverage ];
-
-    # A test needs the HOME directory to be different from $TMPDIR.
-    preCheck = ''
-    HOME=$(mktemp -d)
-    '';
-
-    meta = {
-      description = "Python subprocess interface";
-      homepage = https://pypi.python.org/pypi/sh/;
-      license = licenses.mit;
-    };
-  };
-
+  sh = callPackage ../development/python-modules/sh { };
 
   sipsimple = buildPythonPackage rec {
     name = "sipsimple-${version}";
-- 
cgit 1.4.1