From af9b13436beb6ee9eeea4c34b5ef020a0c36adca Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:58:34 -0400 Subject: [PATCH] pythonPackages.scales: refactor move to python-modules --- .../python-modules/scales/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/scales/default.nix diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix new file mode 100644 index 000000000000..4fb169b15584 --- /dev/null +++ b/pkgs/development/python-modules/scales/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, six +}: + +buildPythonPackage rec { + pname = "scales"; + version = "1.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Stats for Python processes"; + homepage = https://www.github.com/Cue/scales; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc433c996977..10f397b047d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3823,27 +3823,7 @@ in { sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - scales = buildPythonPackage rec { - name = "scales-${version}"; - version = "1.0.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scales/${name}.tar.gz"; - sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; - }; - - buildInputs = with self; optionals doCheck [ nose ]; - # No tests included - doCheck = false; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Stats for Python processes"; - homepage = https://www.github.com/Cue/scales; - license = licenses.asl20; - }; - }; + scales = callPackage ../development/python-modules/scales { }; secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig;