From b9eebaf8bbcc9d01beb04146ae5f8ab9069715d9 Mon Sep 17 00:00:00 2001 From: wisut hantanong Date: Thu, 31 Aug 2017 21:02:44 +0700 Subject: [PATCH] pythonPackages.pyrr : move to separate expression --- .../python-modules/pyrr/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +--------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/pyrr/default.nix diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix new file mode 100644 index 000000000000..fba7a0b27dd9 --- /dev/null +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, setuptools, multipledispatch, numpy }: + +buildPythonPackage rec { + version = "0.7.2"; + pname = "pyrr"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ multipledispatch numpy ]; + + meta = with stdenv.lib; { + description = "3D mathematical functions using NumPy"; + homepage = https://github.com/adamlwgriffiths/Pyrr/; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf9076850bef..e606bac98c65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17817,17 +17817,7 @@ in { proj = null; }; - pyrr = buildPythonPackage rec { - name = "pyrr-${version}"; - version = "0.7.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyrr/pyrr-${version}.tar.gz"; - sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa"; - }; - - buildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with self; [ multipledispatch numpy ]; + pyrr = callPackage ../development/python-modules/pyrr { }; meta = { description = "3D mathematical functions using NumPy";