diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-01 21:58:48 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-02 13:37:53 +0100 |
| commit | e91d4957d0b58f46761d8b1d4d245cdc14c1e34a (patch) | |
| tree | d033f9cc9aaff785475dd0386ea5b1b33c16c0af /pkgs | |
| parent | 6817f26c3560e7f31bc21319f3fb1b99c5d2dc92 (diff) | |
python39Packages.ruamel-ordereddict: normalise name, adopt
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/ruamel-ordereddict/default.nix (renamed from pkgs/development/python-modules/ruamel_ordereddict/default.nix) | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/ruamel_yaml/0.16.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python2-packages.nix | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel-ordereddict/default.nix index 98c36221dcd55..987680ad596f2 100644 --- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/pkgs/development/python-modules/ruamel-ordereddict/default.nix @@ -6,12 +6,13 @@ }: buildPythonPackage rec { - pname = "ruamel.ordereddict"; + pname = "ruamel-ordereddict"; version = "0.4.15"; disabled = isPy3k || isPyPy; src = fetchPypi { - inherit pname version; + pname = "ruamel.ordereddict"; + inherit version; sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4"; }; @@ -19,6 +20,6 @@ buildPythonPackage rec { description = "A version of dict that keeps keys in insertion resp. sorted order"; homepage = "https://sourceforge.net/projects/ruamel-ordereddict/"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - } diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel_yaml/0.16.nix index f2d68f519e4be..c7ac112f3a2ce 100644 --- a/pkgs/development/python-modules/ruamel_yaml/0.16.nix +++ b/pkgs/development/python-modules/ruamel_yaml/0.16.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , ruamel-base -, ruamel_ordereddict +, ruamel-ordereddict , ruamel_yaml_clib ? null , isPy27 , isPyPy @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ ruamel-base ] - ++ lib.optional isPy27 ruamel_ordereddict + ++ lib.optional isPy27 ruamel-ordereddict ++ lib.optional (!isPyPy) ruamel_yaml_clib; # causes namespace clash on py27 diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 927827b66e509..781fdff6dc9c2 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -528,8 +528,7 @@ with self; with super; { robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - ruamel-ordereddict = self.ruamel_ordereddict; - ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; + ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { }; ruamel_yaml = self.ruamel-yaml; ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { }; |