diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loopy/default.nix similarity index 51% rename from pkgs/development/python-modules/loo-py/default.nix rename to pkgs/development/python-modules/loopy/default.nix index d16b06a284ab..75d250ad03da 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loopy/default.nix @@ -1,51 +1,55 @@ { lib , buildPythonPackage -, fetchPypi -, pytools -, pymbolic -, genpy +, codepy , cgen -, islpy -, six , colorama +, fetchFromGitHub +, genpy +, islpy , mako +, numpy +, pymbolic , pyopencl -, pytest +, pyrsistent +, pythonOlder +, pytools }: buildPythonPackage rec { - pname = "loo-py"; - version = "2020.2"; + pname = "loopy"; + version = "2020.2.1"; + format = "setuptools"; - src = fetchPypi { - pname = "loo.py"; - inherit version; - sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "inducer"; + repo = pname; + rev = "v${version}"; + hash = "sha256-GL2GY3fbP9yMEQYyuh4CRHpeN9DGnZxbMt6jC+O/C0g="; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ - pytools - pymbolic - genpy + codepy cgen - islpy - six colorama + genpy + islpy mako + numpy + pymbolic pyopencl + pyrsistent + pytools ]; # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR doCheck = false; - checkPhase = '' - HOME=$(mktemp -d) pytest test - ''; meta = with lib; { description = "A code generator for array-based code on CPUs and GPUs"; - homepage = "https://mathema.tician.de/software/loopy"; + homepage = "https://github.com/inducer/loopy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9a54a773edc1..0dcb33f79658 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 net2grid = gridnet; # add 2022-04-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57152b306691..1e11eb9824a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4945,7 +4945,7 @@ in { lomond = callPackage ../development/python-modules/lomond { }; - loo-py = callPackage ../development/python-modules/loo-py { }; + loopy = callPackage ../development/python-modules/loopy { }; losant-rest = callPackage ../development/python-modules/losant-rest { };