From 7b3d58a5d23909c6f7a4064e99a9544d3be09b2a Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 23 Aug 2023 23:20:46 +0900 Subject: [PATCH 1/5] python310Packages.pyramid-beaker: rename from pyramid_beaker --- .../{pyramid_beaker => pyramid-beaker}/default.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{pyramid_beaker => pyramid-beaker}/default.nix (90%) diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix similarity index 90% rename from pkgs/development/python-modules/pyramid_beaker/default.nix rename to pkgs/development/python-modules/pyramid-beaker/default.nix index 494a8e0c0bfb..4a9fd61f2616 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: buildPythonPackage rec { - pname = "pyramid_beaker"; + pname = "pyramid-beaker"; version = "0.8"; src = fetchPypi { - inherit pname version; + pname = "pyramid_beaker"; + inherit version; sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p"; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 32cf95500d49..718ef80d09ce 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -278,6 +278,7 @@ mapAliases ({ pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 PyMVGLive = pymvglive; # added 2023-02-19 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 + pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06 pyreadability = readability-lxml; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba8343498cf2..d166e607ddae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10678,7 +10678,7 @@ self: super: with self; { pyrainbird = callPackage ../development/python-modules/pyrainbird { }; - pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; + pyramid-beaker = callPackage ../development/python-modules/pyramid-beaker { }; pyramid = callPackage ../development/python-modules/pyramid { }; From 4400a764594949a786a7d990e0f4a72db9756525 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 23 Aug 2023 23:26:49 +0900 Subject: [PATCH 2/5] python310Packages.pyramid-chameleon: rename from pyramid_chameleon --- .../{pyramid_chameleon => pyramid-chameleon}/default.nix | 0 .../test-renderers-pyramid-import.patch | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/{pyramid_chameleon => pyramid-chameleon}/default.nix (100%) rename pkgs/development/python-modules/{pyramid_chameleon => pyramid-chameleon}/test-renderers-pyramid-import.patch (100%) diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid-chameleon/default.nix similarity index 100% rename from pkgs/development/python-modules/pyramid_chameleon/default.nix rename to pkgs/development/python-modules/pyramid-chameleon/default.nix diff --git a/pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch b/pkgs/development/python-modules/pyramid-chameleon/test-renderers-pyramid-import.patch similarity index 100% rename from pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch rename to pkgs/development/python-modules/pyramid-chameleon/test-renderers-pyramid-import.patch diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 718ef80d09ce..ac55232dec38 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -279,6 +279,7 @@ mapAliases ({ PyMVGLive = pymvglive; # added 2023-02-19 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyramid_beaker = pyramid-beaker; # added 2023-08-23 + pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06 pyreadability = readability-lxml; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d166e607ddae..e199a3d4873c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10682,7 +10682,7 @@ self: super: with self; { pyramid = callPackage ../development/python-modules/pyramid { }; - pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; + pyramid-chameleon = callPackage ../development/python-modules/pyramid-chameleon { }; pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; From 9520a3344b57db944d2feb99605702fd99ce4a98 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 24 Aug 2023 00:16:00 +0900 Subject: [PATCH 3/5] python310Packages.pyramid-exclog: rename from pyramid_exclog --- .../{pyramid_exclog => pyramid-exclog}/default.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{pyramid_exclog => pyramid-exclog}/default.nix (87%) diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid-exclog/default.nix similarity index 87% rename from pkgs/development/python-modules/pyramid_exclog/default.nix rename to pkgs/development/python-modules/pyramid-exclog/default.nix index 61a95bae84e2..c54ff94ff167 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid-exclog/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "pyramid_exclog"; + pname = "pyramid-exclog"; version = "1.1"; src = fetchPypi { - inherit pname version; + pname = "pyramid_exclog"; + inherit version; hash = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ac55232dec38..0283dbaabd9e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -280,6 +280,7 @@ mapAliases ({ pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 + pyramid_exclog = pyramid-exclog; # added 2023-08-24 pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06 pyreadability = readability-lxml; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e199a3d4873c..28971e5aa7de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10684,7 +10684,7 @@ self: super: with self; { pyramid-chameleon = callPackage ../development/python-modules/pyramid-chameleon { }; - pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; + pyramid-exclog = callPackage ../development/python-modules/pyramid-exclog { }; pyramid-jinja2 = callPackage ../development/python-modules/pyramid-jinja2 { }; From 20d20c162a234c12dcfb3c5a390922fcf4d1c62d Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 24 Aug 2023 00:18:26 +0900 Subject: [PATCH 4/5] python310Packages.pyramid-mako: rename from pyramid_mako --- pkgs/development/python-modules/pypugjs/default.nix | 4 ++-- .../python-modules/{pyramid_mako => pyramid-mako}/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{pyramid_mako => pyramid-mako}/default.nix (97%) diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 9590b7d07b90..cf2a413a04d2 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -7,7 +7,7 @@ , mako , nose , pyramid -, pyramid_mako +, pyramid-mako , pytestCheckHook , six , tornado @@ -33,7 +33,7 @@ buildPythonPackage rec { nose tornado pyramid - pyramid_mako + pyramid-mako pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid-mako/default.nix similarity index 97% rename from pkgs/development/python-modules/pyramid_mako/default.nix rename to pkgs/development/python-modules/pyramid-mako/default.nix index be9c76eeb882..d55eee1a37f3 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid-mako/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "pyramid_mako"; + pname = "pyramid-mako"; version = "1.1.0"; src = fetchPypi { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0283dbaabd9e..ffd6e0d786ea 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -283,6 +283,7 @@ mapAliases ({ pyramid_exclog = pyramid-exclog; # added 2023-08-24 pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06 + pyramid_mako = pyramid-mako; # added 2023-08-24 pyreadability = readability-lxml; # added 2022-05-24 pyres = throw "pyres has been removed, since it is abandoned and broken"; # added 2023-06-20 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28971e5aa7de..4e5383a93a00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10688,7 +10688,7 @@ self: super: with self; { pyramid-jinja2 = callPackage ../development/python-modules/pyramid-jinja2 { }; - pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; + pyramid-mako = callPackage ../development/python-modules/pyramid-mako { }; pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; From 13d6bf79acf6bfb94dd6d285f78d01173585582c Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 24 Aug 2023 00:22:10 +0900 Subject: [PATCH 5/5] python310Packages.pyramid-multiauth: rename from pyramid_multiauth --- .../{pyramid_multiauth => pyramid-multiauth}/default.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{pyramid_multiauth => pyramid-multiauth}/default.nix (86%) diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid-multiauth/default.nix similarity index 86% rename from pkgs/development/python-modules/pyramid_multiauth/default.nix rename to pkgs/development/python-modules/pyramid-multiauth/default.nix index 22e32aa4d1ee..f0feafaa5961 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid-multiauth/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "pyramid_multiauth"; + pname = "pyramid-multiauth"; version = "1.0.1"; src = fetchPypi { - inherit pname version; + pname = "pyramid-multiauth"; + inherit version; sha256 = "6d8785558e1d0bbe0d0da43e296efc0fbe0de5071d1f9b1091e891f0e4ec9682"; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ffd6e0d786ea..2b534c420d7d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -284,6 +284,7 @@ mapAliases ({ pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06 pyramid_mako = pyramid-mako; # added 2023-08-24 + pyramid_multiauth = pyramid-multiauth; # added 2023-08-24 pyreadability = readability-lxml; # added 2022-05-24 pyres = throw "pyres has been removed, since it is abandoned and broken"; # added 2023-06-20 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e5383a93a00..9204b1ef4f66 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10690,7 +10690,7 @@ self: super: with self; { pyramid-mako = callPackage ../development/python-modules/pyramid-mako { }; - pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; + pyramid-multiauth = callPackage ../development/python-modules/pyramid-multiauth { }; pyrate-limiter = callPackage ../development/python-modules/pyrate-limiter { };