From 744912a96cf4755ec5fca2f05b029b352b003e8a Mon Sep 17 00:00:00 2001 From: ruro Date: Sat, 8 Feb 2025 16:58:48 +0300 Subject: [PATCH] python3Packages.zcs: remove This package was only used as a dependency of bpycv which was removed in the previous commit. --- .../python-modules/zcs/default.nix | 41 ------------------- .../python-modules/zcs/fix-test-yaml.patch | 13 ------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/python-modules/zcs/default.nix delete mode 100644 pkgs/development/python-modules/zcs/fix-test-yaml.patch diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix deleted file mode 100644 index d6aaad9d8ab7..000000000000 --- a/pkgs/development/python-modules/zcs/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - python, - yacs, - boxx, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "zcs"; - version = "0.1.25"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-/QIyRQtxLDVW+vcQi5bL8rJ0o3+OhqGhQEALR1YO1pg="; - }; - - patches = [ ./fix-test-yaml.patch ]; - - propagatedBuildInputs = [ yacs ]; - - pythonImportsCheck = [ "zcs" ]; - - nativeCheckInputs = [ boxx ]; - - checkPhase = '' - ${python.interpreter} test/test_zcs.py - ''; - - meta = with lib; { - description = "Configuration system which takes advantage of both argparse and yacs"; - homepage = "https://github.com/DIYer22/zcs"; - license = licenses.mit; - maintainers = with maintainers; [ lucasew ]; - }; -} diff --git a/pkgs/development/python-modules/zcs/fix-test-yaml.patch b/pkgs/development/python-modules/zcs/fix-test-yaml.patch deleted file mode 100644 index a046f1808296..000000000000 --- a/pkgs/development/python-modules/zcs/fix-test-yaml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/test_zcs.py b/test/test_zcs.py -index e4981d3..893999f 100644 ---- a/test/test_zcs.py -+++ b/test/test_zcs.py -@@ -65,7 +65,7 @@ class TestCfgNode(unittest.TestCase): - cfg = self.cfg.clone() - yamlp = pathjoin(tmpboxx(), "test.yaml") - cfg.dump(yamlp) -- cfg_dict = yaml.load(open(yamlp)) -+ cfg_dict = yaml.load(open(yamlp), yaml.Loader) - cfgd = CfgNode(cfg_dict) - self.assertTrue(str(cfg.dump()) == str(cfgd.dump())) - diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6e4f9beaf386..4f86ef14f255 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -761,6 +761,7 @@ mapAliases ({ zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zc-buildout221 = zc-buildout; # added 2021-07-21 zc_lockfile = zc-lockfile; # added 2024-01-06 + zcs = throw "zcs was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08 zipstream = throw "zipstream has been removed, because it has been unmaintained for 6 years and there are no dependent packages"; # added 2024-05-26 zipstream-new = throw "zipstream-new has been removed, because it was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05 zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7031dfa10743..4935604cd262 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18687,8 +18687,6 @@ self: super: with self; { zconfig = callPackage ../development/python-modules/zconfig { }; - zcs = callPackage ../development/python-modules/zcs { }; - zdaemon = callPackage ../development/python-modules/zdaemon { }; zeek = (toPythonModule (pkgs.zeek.broker.override {