diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-10-25 21:09:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-25 21:09:25 +0100 |
commit | aaebcef6b21963f9f5aa51f2220edd7c1e538af0 (patch) | |
tree | d29eab7085ef61ad6bab144b9300ed86f9f1fa09 /pkgs/top-level | |
parent | f13c421ff83a96db609a8c5879f543d7dd73c91d (diff) | |
parent | a3bc5d6ae65a040f3f84215bd7a32a424c1e4029 (diff) | |
download | nixlib-aaebcef6b21963f9f5aa51f2220edd7c1e538af0.tar nixlib-aaebcef6b21963f9f5aa51f2220edd7c1e538af0.tar.gz nixlib-aaebcef6b21963f9f5aa51f2220edd7c1e538af0.tar.bz2 nixlib-aaebcef6b21963f9f5aa51f2220edd7c1e538af0.tar.lz nixlib-aaebcef6b21963f9f5aa51f2220edd7c1e538af0.tar.xz nixlib-aaebcef6b21963f9f5aa51f2220edd7c1e538af0.tar.zst nixlib-aaebcef6b21963f9f5aa51f2220edd7c1e538af0.zip |
Merge pull request #30780 from veprbl/rootpy_1.0.1
add pythonPackages.root_numpy, bump python2Packages.rootpy
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 380538750cd1..cf670a40c6cc 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}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rootpy/${name}.tar.gz"; - sha256 = "04alx6afiyahhv816f6zpwnm0sx2jxgqpgqcn6kdw0wnpc9625cr"; - }; - - disabled = isPy3k; + root_numpy = callPackage ../development/python-modules/root_numpy { }; - 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"; |