From 82c8cfe12c0a417b3102703003b5375ef9e07d61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:37:27 +0200 Subject: [PATCH] python2.pkgs.catalogue: keep 1.0.0 for python 2 --- .../python-modules/catalogue/1.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/catalogue/1.nix diff --git a/pkgs/development/python-modules/catalogue/1.nix b/pkgs/development/python-modules/catalogue/1.nix new file mode 100644 index 00000000000..9376377e9c7 --- /dev/null +++ b/pkgs/development/python-modules/catalogue/1.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "catalogue"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d74d1d856c6b36a37bf14aa6dbbc27d0582667b7ab979a6108e61a575e8723f5"; + }; + + propagatedBuildInputs = [ importlib-metadata ]; + + meta = with stdenv.lib; { + description = "Tiny library for adding function or object registries"; + homepage = "https://github.com/explosion/catalogue"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d795669d2c..31cfe3cd60a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -566,7 +566,10 @@ in { cadquery = callPackage ../development/python-modules/cadquery { }; - catalogue = callPackage ../development/python-modules/catalogue { }; + catalogue = if isPy3k then + callPackage ../development/python-modules/catalogue { } + else + callPackage ../development/python-modules/catalogue/1.nix { }; cbeams = callPackage ../misc/cbeams { };