From 4f920540c56e17efa005160629f50b1d50077b9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 25 Nov 2023 10:14:08 +0100 Subject: [PATCH 1/2] python311Packages: translate stringy licenses cc #269788 --- pkgs/development/python-modules/cytoolz/default.nix | 4 ++-- pkgs/development/python-modules/pillow-simd/default.nix | 2 +- pkgs/development/python-modules/pycollada/default.nix | 2 +- pkgs/development/python-modules/pyopengl/default.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index ce24c505b83b..fafc31d65882 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -32,10 +32,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = { + meta = with lib; { homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; - license = "licenses.bsd3"; + license = licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index ca0d947d37b1..55842f20019d 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -31,7 +31,7 @@ import ../pillow/generic.nix (rec { Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. ''; - license = "http://www.pythonware.com/products/pil/license.htm"; + license = licenses.hpnd; maintainers = with maintainers; [ ]; }; } // args ) diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 06daa9194610..24f4d26fe02d 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for reading and writing collada documents"; homepage = "http://pycollada.github.io/"; - license = "BSD"; # they don't specify which BSD variant + license = licenses.bsd3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 318f2aa033b6..428bd4084ae0 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { Python 2.5) ctypes library, and is provided under an extremely liberal BSD-style Open-Source license. ''; - license = "BSD-style"; + license = licenses.bsd3; platforms = platforms.mesaPlatforms; }; From 878adc2e521994ef154b82d8528d369471fab16d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 25 Nov 2023 10:17:05 +0100 Subject: [PATCH 2/2] python311Packages.paypalrestsdk: drop With the repository having been deprecated in 2020, there is little reason for us to keep this leaf package around. --- .../python-modules/paypalrestsdk/default.nix | 20 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/python-modules/paypalrestsdk/default.nix diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix deleted file mode 100644 index 0562be6ee739..000000000000 --- a/pkgs/development/python-modules/paypalrestsdk/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ buildPythonPackage, fetchPypi -, requests, six, pyopenssl }: - -buildPythonPackage rec { - pname = "paypalrestsdk"; - version = "1.13.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kZUfNtsw1oW5ceFASYSRo1bPHfjv9xZWYDrKTtcs81o="; - }; - - propagatedBuildInputs = [ requests six pyopenssl ]; - - meta = { - homepage = "https://developer.paypal.com/"; - description = "Python APIs to create, process and manage payment"; - license = "PayPal SDK License"; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 94898d9db892..3605c6373664 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -264,6 +264,7 @@ mapAliases ({ pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 + paypalrestsdk = throw "paypalrestsdk was removed, the upstream repo was archived back in 2020"; # Added 2023-11-25 pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29 pdfminer = pdfminer-six; # added 2022-05-25 pep257 = pydocstyle; # added 2022-04-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35554ba70d38..458b42b4bda5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8855,8 +8855,6 @@ self: super: with self; { paypalhttp = callPackage ../development/python-modules/paypalhttp { }; - paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; - pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; pbr = callPackage ../development/python-modules/pbr { };