nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 14:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

python39Packages.ruamel-yaml-clib: normalise name, adopt

Browse Source
This commit is contained in:
Sandro Jäckel 2021-11-01 22:00:09 +01:00
parent b2767b69dd
commit b592957ea1
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/ruamel_yaml_clib/default.nix → pkgs/development/python-modules/ruamel-yaml-clib/default.nix
View File

@ -4,7 +4,7 @@
}:
buildPythonPackage rec {
pname = "ruamel.yaml.clib";
pname = "ruamel-yaml-clib";
version = "0.2.4";
src = fetchhg {

4
pkgs/development/python-modules/ruamel-yaml/0.16.nix
View File

@ -3,7 +3,7 @@
, fetchPypi
, ruamel-base
, ruamel-ordereddict
, ruamel_yaml_clib ? null
, ruamel-yaml-clib ? null
, isPy27
, isPyPy
}:
@ -23,7 +23,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ ruamel-base ]
++ lib.optional isPy27 ruamel-ordereddict
++ lib.optional (!isPyPy) ruamel_yaml_clib;
++ lib.optional (!isPyPy) ruamel-yaml-clib;
# causes namespace clash on py27
dontUsePythonImportsCheck = isPy27;

4
pkgs/development/python-modules/ruamel-yaml/default.nix
View File

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, ruamel-base
, ruamel_yaml_clib
, ruamel-yaml-clib
, isPyPy
}:
@ -20,7 +20,7 @@ buildPythonPackage rec {
doCheck = false;
propagatedBuildInputs = [ ruamel-base ]
++ lib.optional (!isPyPy) ruamel_yaml_clib;
++ lib.optional (!isPyPy) ruamel-yaml-clib;
pythonImportsCheck = [ "ruamel.yaml" ];

1
pkgs/top-level/python-aliases.nix
View File

@ -81,6 +81,7 @@ mapAliases ({
rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
ruamel_base = ruamel-base; # added 2021-11-01
ruamel_yaml = ruamel-yaml; # added 2021-11-01
ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
scikitlearn = scikit-learn; # added 2021-07-21
selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
setuptools_scm = setuptools-scm; # added 2021-06-03

3
pkgs/top-level/python-packages.nix
View File

@ -8206,8 +8206,7 @@ in {
ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { };
ruamel-yaml-clib = self.ruamel_yaml_clib;
ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { };
ruamel-yaml-clib = callPackage ../development/python-modules/ruamel-yaml-clib { };
rubymarshal = callPackage ../development/python-modules/rubymarshal { };