From 43584c316130f85572480c72fdbc26856d00a68c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:02:48 -0400 Subject: [PATCH] pythonPackages.sh: refactor move to python-modules --- .../development/python-modules/sh/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/sh/default.nix diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix new file mode 100644 index 00000000000..f2997b01607 --- /dev/null +++ b/pkgs/development/python-modules/sh/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sh"; + version = "1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python subprocess interface"; + homepage = https://pypi.python.org/pypi/sh/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30ebd93b25f..66f4724daa1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3833,22 +3833,7 @@ in { sexpdata = callPackage ../development/python-modules/sexpdata { }; - sh = buildPythonPackage rec { - name = "sh-1.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sh/${name}.tar.gz"; - sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4"; - }; - - doCheck = false; - - meta = { - description = "Python subprocess interface"; - homepage = https://pypi.python.org/pypi/sh/; - }; - }; - + sh = callPackage ../development/python-modules/sh { }; sipsimple = buildPythonPackage rec { name = "sipsimple-${version}";