From 985f638488d0a9490f4d4c1f63755e9b0ccf262d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Feb 2023 16:49:11 +0000 Subject: [PATCH] python310Packages.formencode: Normalize attribute, pname and dirname --- .../python-modules/{FormEncode => formencode}/default.nix | 5 +++-- pkgs/development/python-modules/pywbem/default.nix | 4 ++-- pkgs/development/python-modules/sqlobject/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{FormEncode => formencode}/default.nix (92%) diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/formencode/default.nix similarity index 92% rename from pkgs/development/python-modules/FormEncode/default.nix rename to pkgs/development/python-modules/formencode/default.nix index 307ad10b304a..1323f2902cfc 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -10,13 +10,14 @@ }: buildPythonPackage rec { - pname = "FormEncode"; + pname = "formencode"; version = "2.0.1"; disabled = isPy27; src = fetchPypi { - inherit pname version; + pname = "FormEncode"; + inherit version; sha256 = "8f2974112c2557839d5bae8b76490104c03830785d923abbdef148bf3f710035"; }; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index e02d767ce938..0b32bf7f545b 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , decorator , fetchPypi -, FormEncode +, formencode , httpretty , libxml2 , lxml @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ decorator - FormEncode + formencode httpretty libxml2 lxml diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 4b30f56a9f27..21c48ad86ef7 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, FormEncode +, formencode , pastedeploy , paste , pydispatcher @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - FormEncode + formencode paste pastedeploy pydispatcher diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 42299240441e..a6c20a4da99c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -95,6 +95,7 @@ mapAliases ({ flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 + FormEncode = formencode; # added 2023-02-19 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5157603f22c5..985ac8554332 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3597,7 +3597,7 @@ self: super: with self; { fortiosapi = callPackage ../development/python-modules/fortiosapi { }; - FormEncode = callPackage ../development/python-modules/FormEncode { }; + formencode = callPackage ../development/python-modules/formencode { }; foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; };