summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-26 13:12:38 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-27 09:07:24 +0200
commitda5c9085932061a78ef24a696c3a3449976a8c33 (patch)
treec7f2b04150e52717299fa006f8b539fa23e7b815
parent567da0c23c181db7ebe9c9646ffb6a5ec21782ac (diff)
downloadnixpkgs-da5c9085932061a78ef24a696c3a3449976a8c33.tar
nixpkgs-da5c9085932061a78ef24a696c3a3449976a8c33.tar.gz
nixpkgs-da5c9085932061a78ef24a696c3a3449976a8c33.tar.bz2
nixpkgs-da5c9085932061a78ef24a696c3a3449976a8c33.tar.lz
nixpkgs-da5c9085932061a78ef24a696c3a3449976a8c33.tar.xz
nixpkgs-da5c9085932061a78ef24a696c3a3449976a8c33.tar.zst
nixpkgs-da5c9085932061a78ef24a696c3a3449976a8c33.zip
pythonPackages.scripttest: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/scripttest/default.nix27
-rw-r--r--pkgs/top-level/python-packages.nix20
2 files changed, 28 insertions, 19 deletions
diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix
new file mode 100644
index 00000000000..2ae7a4c8e36
--- /dev/null
+++ b/pkgs/development/python-modules/scripttest/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.3";
+  pname = "scripttest";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "951cfc25219b0cd003493a565f2e621fd791beaae9f9a3bdd7024d8626419c38";
+  };
+
+  buildInputs = [ pytest ];
+
+  # Tests are not included. See https://github.com/pypa/scripttest/issues/11
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A library for testing interactive command-line applications";
+    homepage = https://pypi.python.org/pypi/ScriptTest/;
+    license = licenses.mit;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72bce231057..bdaec829cfc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3698,25 +3698,7 @@ in {
 
   scp = callPackage ../development/python-modules/scp {};
 
-  scripttest = buildPythonPackage rec {
-    version = "1.3";
-    name = "scripttest-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scripttest/scripttest-${version}.tar.gz";
-      sha256 = "951cfc25219b0cd003493a565f2e621fd791beaae9f9a3bdd7024d8626419c38";
-    };
-
-    buildInputs = with self; [ pytest ];
-
-    # Tests are not included. See https://github.com/pypa/scripttest/issues/11
-    doCheck = false;
-
-    meta = {
-      description = "A library for testing interactive command-line applications";
-      homepage = https://pypi.python.org/pypi/ScriptTest/;
-    };
-  };
+  scripttest = callPackage ../development/python-modules/scripttest { };
 
   seaborn = callPackage ../development/python-modules/seaborn { };