swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

python39Packages.ruamel-ordereddict: normalise name, adopt

Browse source
This commit is contained in:
Sandro Jäckel 2021-11-01 21:58:48 +01:00
parent 6817f26c35
commit e91d4957d0
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/python-modules/ruamel_ordereddict/default.nix → pkgs/development/python-modules/ruamel-ordereddict/default.nix
View file

@ -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 ];
};
}

4
pkgs/development/python-modules/ruamel_yaml/0.16.nix
View file

@ -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

3
pkgs/top-level/python2-packages.nix
View file

@ -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 { };