summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2021-11-01 21:59:40 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2021-11-02 13:38:06 +0100
commitb2767b69ddc702eb926633a5f2336534352cb7b8 (patch)
tree9bb8b9e9c9e74795e4aa879182455b4cc882d8f2 /pkgs/top-level
parente91d4957d0b58f46761d8b1d4d245cdc14c1e34a (diff)
downloadnixpkgs-b2767b69ddc702eb926633a5f2336534352cb7b8.tar
nixpkgs-b2767b69ddc702eb926633a5f2336534352cb7b8.tar.gz
nixpkgs-b2767b69ddc702eb926633a5f2336534352cb7b8.tar.bz2
nixpkgs-b2767b69ddc702eb926633a5f2336534352cb7b8.tar.lz
nixpkgs-b2767b69ddc702eb926633a5f2336534352cb7b8.tar.xz
nixpkgs-b2767b69ddc702eb926633a5f2336534352cb7b8.tar.zst
nixpkgs-b2767b69ddc702eb926633a5f2336534352cb7b8.zip
python39Packages.ruamel-yaml: normalise name, adopt
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-aliases.nix1
-rw-r--r--pkgs/top-level/python-packages.nix3
-rw-r--r--pkgs/top-level/python2-packages.nix3
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 88c60c9da14..8fdf532415e 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -80,6 +80,7 @@ mapAliases ({
   requests_toolbelt = requests-toolbelt; # added 2017-09-26
   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
   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
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e9adf60c681..ce39b368af5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8204,8 +8204,7 @@ in {
 
   ruamel-base = callPackage ../development/python-modules/ruamel-base { };
 
-  ruamel-yaml = self.ruamel_yaml;
-  ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { };
+  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 { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 781fdff6dc9..bafb05515fe 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -530,8 +530,7 @@ with self; with super; {
 
   ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { };
 
-  ruamel_yaml = self.ruamel-yaml;
-  ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { };
+  ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml/0.16.nix { };
 
   runsnakerun = callPackage ../development/python-modules/runsnakerun { };