From bba4b2ce001d41f76a35c0a645405840cd8f2211 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 8 Dec 2021 21:02:28 -0800 Subject: [PATCH] python3Packages.zc_buildout_nix: remove No longer builds, not referenced within nixpkgs, and pinned to an old version. --- .../python-modules/buildout-nix/default.nix | 22 --------------- .../python-modules/buildout-nix/nix.patch | 28 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/development/python-modules/buildout-nix/default.nix delete mode 100644 pkgs/development/python-modules/buildout-nix/nix.patch diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix deleted file mode 100644 index 834dd42bc087..000000000000 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "zc.buildout"; - version = "2.13.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63"; - }; - - patches = [ ./nix.patch ]; - - postInstall = "mv $out/bin/buildout{,-nix}"; - - meta = with lib; { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpl21; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch deleted file mode 100644 index 49f3c6d90f0a..000000000000 --- a/pkgs/development/python-modules/buildout-nix/nix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/zc/buildout/buildout.py 2017-08-18 10:06:24.946428977 +0300 -+++ b/src/zc/buildout/buildout.py 2017-08-18 10:08:49.115613364 +0300 -@@ -382,6 +382,10 @@ - if k not in versions - )) - -+ # Override versions with available (nix) system packages -+ for dist in pkg_resources.working_set: -+ versions[dist.project_name] = SectionKey(dist.version, dist.location) -+ - # Absolutize some particular directory, handling also the ~/foo form, - # and considering the location of the configuration file that generated - # the setting as the base path, falling back to the main configuration ---- a/src/zc/buildout/easy_install.py 2017-08-18 10:06:24.948428980 +0300 -+++ b/src/zc/buildout/easy_install.py 2017-08-18 10:07:37.462521740 +0300 -@@ -321,6 +321,12 @@ - - def _satisfied(self, req, source=None): - dists = [dist for dist in self._env[req.project_name] if dist in req] -+ try: -+ dists = ([dist for dist in dists -+ if dist.precedence == pkg_resources.DEVELOP_DIST] -+ + [pkg_resources.get_distribution(req.project_name)]) -+ except pkg_resources.DistributionNotFound: -+ pass - if not dists: - logger.debug('We have no distributions for %s that satisfies %r.', - req.project_name, str(req)) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4c14877d1558..f8c8306f8313 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -106,4 +106,5 @@ mapAliases ({ WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 websocket_client = websocket-client; # added 2021-06-15 zc-buildout221 = zc-buildout; # added 2021-07-21 + zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 923021d96659..0bd691492900 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10357,8 +10357,6 @@ in { zc-buildout = callPackage ../development/python-modules/buildout { }; - zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; zconfig = callPackage ../development/python-modules/zconfig { };