diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index e302e9b6bdc0..1bb120cb8165 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -79,7 +79,7 @@ let keep = self: hooks self { }; optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; - python2Extension = import ../../../top-level/python2-packages.nix; + python2Extension = import ../../misc/resholve/python2-packages.nix; extensions = lib.composeManyExtensions ( [ hooks diff --git a/pkgs/development/python2-modules/README.md b/pkgs/development/misc/resholve/python2-modules/README.md similarity index 100% rename from pkgs/development/python2-modules/README.md rename to pkgs/development/misc/resholve/python2-modules/README.md diff --git a/pkgs/development/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix similarity index 100% rename from pkgs/development/python2-modules/bootstrapped-pip/default.nix rename to pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/misc/resholve/python2-modules/pip/default.nix similarity index 100% rename from pkgs/development/python2-modules/pip/default.nix rename to pkgs/development/misc/resholve/python2-modules/pip/default.nix diff --git a/pkgs/development/python2-modules/setuptools/default.nix b/pkgs/development/misc/resholve/python2-modules/setuptools/default.nix similarity index 100% rename from pkgs/development/python2-modules/setuptools/default.nix rename to pkgs/development/misc/resholve/python2-modules/setuptools/default.nix diff --git a/pkgs/development/python2-modules/setuptools/tag-date.patch b/pkgs/development/misc/resholve/python2-modules/setuptools/tag-date.patch similarity index 100% rename from pkgs/development/python2-modules/setuptools/tag-date.patch rename to pkgs/development/misc/resholve/python2-modules/setuptools/tag-date.patch diff --git a/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/misc/resholve/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch similarity index 100% rename from pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch rename to pkgs/development/misc/resholve/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch diff --git a/pkgs/development/python2-modules/wheel/default.nix b/pkgs/development/misc/resholve/python2-modules/wheel/default.nix similarity index 100% rename from pkgs/development/python2-modules/wheel/default.nix rename to pkgs/development/misc/resholve/python2-modules/wheel/default.nix diff --git a/pkgs/development/misc/resholve/python2-packages.nix b/pkgs/development/misc/resholve/python2-packages.nix new file mode 100644 index 000000000000..733e6cadd7c3 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-packages.nix @@ -0,0 +1,17 @@ +# Extension with Python 2 packages that is overlaid on top +# of the Python 3 packages set. This way, Python 2+3 compatible +# packages can still be used. + +self: super: + +with self; +with super; +{ + bootstrapped-pip = toPythonModule (callPackage ./python2-modules/bootstrapped-pip { }); + + pip = callPackage ./python2-modules/pip { }; + + setuptools = callPackage ./python2-modules/setuptools { }; + + wheel = callPackage ./python2-modules/wheel { }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix deleted file mode 100644 index 36b6823a2d73..000000000000 --- a/pkgs/top-level/python2-packages.nix +++ /dev/null @@ -1,17 +0,0 @@ -# Extension with Python 2 packages that is overlaid on top -# of the Python 3 packages set. This way, Python 2+3 compatible -# packages can still be used. - -self: super: - -with self; -with super; -{ - bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); - - pip = callPackage ../development/python2-modules/pip { }; - - setuptools = callPackage ../development/python2-modules/setuptools { }; - - wheel = callPackage ../development/python2-modules/wheel { }; -}