From 1c0b74c50ae93fe0438cb30fd449bf94acfdd6bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Apr 2017 11:50:55 +0200 Subject: [PATCH] pythonPackages.xarray: 0.9.1 -> 0.9.5 --- .../python-modules/xarray/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/xarray/default.nix diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix new file mode 100644 index 000000000000..fe0497bc0e89 --- /dev/null +++ b/pkgs/development/python-modules/xarray/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, numpy +, pandas +, python +}: + +buildPythonPackage rec { + pname = "xarray"; + version = "0.9.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "d23bfcc317829570daa1fe8306ad7ff62cd77847bbd68e3ffc53d847bff7c36d"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [numpy pandas]; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + meta = { + description = "N-D labeled arrays and datasets in Python"; + homepage = https://github.com/pydata/xarray; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 681710d85885..38cab5cc0a25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27250,29 +27250,7 @@ EOF }; }); - xarray = buildPythonPackage rec { - name = "xarray-${version}"; - version = "0.9.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/x/xarray/${name}.tar.gz"; - sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [numpy pandas]; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - meta = { - description = "N-D labeled arrays and datasets in Python"; - homepage = https://github.com/pydata/xarray; - license = licenses.asl20; - maintainers = with maintainers; [ fridh ]; - }; - }; + xarray = callPackage ../development/python-modules/xarray { }; xlwt = callPackage ../development/python-modules/xlwt { };