From 0671a2b6d40079af17896abe30bd89399c182ae0 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Wed, 1 Nov 2017 10:35:20 +0100 Subject: [PATCH 1/2] pythonPackage.jug: 1.6.1 -> 1.6.3 Minor update to Jug (Python package) --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be1ff17ee01..64d79d22a77d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6111,7 +6111,7 @@ in { jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; jug = buildPythonPackage rec { - version = "1.6.1"; + version = "1.6.3"; name = "jug-${version}"; buildInputs = with self; [ nose numpy ]; propagatedBuildInputs = with self; [ @@ -6125,7 +6125,7 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "15lv998mz6kpp65kh8wsfnrl5ay02bk1lm07nbbdv2k455bhrn1i"; + sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; }; meta = { From 25ed4dcac58ff9b727bf3baafeda765ff80b78c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Nov 2017 05:25:58 -0500 Subject: [PATCH 2/2] python.pkgs.jug: move to python modules --- .../python-modules/jug/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +--------------- 2 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/jug/default.nix diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix new file mode 100644 index 000000000000..ab94d7b40acb --- /dev/null +++ b/pkgs/development/python-modules/jug/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, numpy +, bottle, pyyaml, redis, six +, zlib }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Jug"; + version = "1.6.3"; + buildInputs = [ nose numpy ]; + propagatedBuildInputs = [ + bottle + pyyaml + redis + six + + zlib + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; + }; + + meta = with stdenv.lib; { + description = "A Task-Based Parallelization Framework"; + license = licenses.mit; + url = https://jug.readthedocs.io/; + maintainers = with maintainers; [ luispedro ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64d79d22a77d..8c3dfe0e0d4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6110,31 +6110,7 @@ in { jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; - jug = buildPythonPackage rec { - version = "1.6.3"; - name = "jug-${version}"; - buildInputs = with self; [ nose numpy ]; - propagatedBuildInputs = with self; [ - bottle - pyyaml - redis - six - - pkgs.zlib - ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; - }; - - meta = { - description = "A Task-Based Parallelization Framework"; - license = licenses.mit; - url = https://jug.readthedocs.io/; - maintainers = with maintainers; [ luispedro ]; - }; - }; + jug = callPackage ../development/python-modules/jug {}; jsmin = callPackage ../development/python-modules/jsmin { };