diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix new file mode 100644 index 00000000000..008bafae9d7 --- /dev/null +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root }: + +buildPythonPackage rec { + pname = "root_numpy"; + version = "4.7.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vy6mqmkddfv46yc4hp43fvaisn3yw92ryaw031k841hhj73q0xg"; + }; + + disabled = isPy3k; # blocked by #27649 + + propagatedBuildInputs = [ numpy root ]; + + meta = with lib; { + homepage = http://scikit-hep.org/root_numpy; + license = licenses.bsd3; + description = "The interface between ROOT and NumPy"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix new file mode 100644 index 00000000000..0827786acfc --- /dev/null +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables }: + +buildPythonPackage rec { + pname = "rootpy"; + version = "1.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zp2bh87l3f0shiqslbvfmavfdj8m80y8fsrz8rsi5pzqj7zr1bx"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ]; + + meta = with lib; { + homepage = http://www.rootpy.org; + license = licenses.bsd3; + description = "Pythonic interface to the ROOT framework"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 380538750cd..cf670a40c6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18874,25 +18874,9 @@ in { }; }; - rootpy = buildPythonPackage rec { - version = "0.9.0"; - name = "rootpy-${version}"; + root_numpy = callPackage ../development/python-modules/root_numpy { }; - src = pkgs.fetchurl { - url = "mirror://pypi/r/rootpy/${name}.tar.gz"; - sha256 = "04alx6afiyahhv816f6zpwnm0sx2jxgqpgqcn6kdw0wnpc9625cr"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [ pkgs.root numpy matplotlib ]; - - meta = { - homepage = "http://www.rootpy.org"; - license = licenses.gpl3; - description = "Pythonic interface to the ROOT framework"; - }; - }; + rootpy = callPackage ../development/python-modules/rootpy { }; rope = buildPythonPackage rec { version = "0.10.2";