From e18e2779343bc7f4ed7e7520cd6d50ed5b02da55 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Dec 2024 22:56:02 +0100 Subject: [PATCH 1/2] s3ql: remove dugong dependency the module has been vendored into it: https://github.com/s3ql/s3ql/commit/9819f85ec310b0345e7fe09f5a4805916d7ddeca --- pkgs/by-name/s3/s3ql/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/s3/s3ql/package.nix b/pkgs/by-name/s3/s3ql/package.nix index 57f1a6aecfeb..8104a7c3c26e 100644 --- a/pkgs/by-name/s3/s3ql/package.nix +++ b/pkgs/by-name/s3/s3ql/package.nix @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { apsw cryptography defusedxml - dugong google-auth google-auth-oauthlib pyfuse3 From e4d990c80aa297a2be2ff80c3180f798b850f824 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Dec 2024 22:57:31 +0100 Subject: [PATCH 2/2] python3Packages.dugong: deprecate --- .../python-modules/dugong/default.nix | 38 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/development/python-modules/dugong/default.nix diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix deleted file mode 100644 index 345161c8350f..000000000000 --- a/pkgs/development/python-modules/dugong/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "dugong"; - version = "3.8.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "python-dugong"; - repo = "python-dugong"; - rev = "release-${version}"; - sha256 = "1063c1779idc5nrjzfv5w1xqvyy3crapb2a2xll9y6xphxclnkjc"; - }; - - nativeCheckInputs = [ pytestCheckHook ]; - - # Lots of tests hang during teardown with: - # ssl.SSLEOFError: EOF occurred in violation of protocol (_ssl.c:2396) - doCheck = pythonOlder "3.10"; - - pythonImportsCheck = [ "dugong" ]; - - meta = with lib; { - description = "HTTP 1.1 client designed for REST-ful APIs"; - homepage = "https://github.com/python-dugong/python-dugong/"; - license = with licenses; [ - psfl - asl20 - ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5d188743792e..3df5c819cedd 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -182,6 +182,7 @@ mapAliases ({ doctest-ignore-unicode = throw "doctest-ignore-unicode has been removed since it has been unmaintained for 11 years"; # added 2024-05-20 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 + dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24b154a3183b..3f8270527c48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3914,8 +3914,6 @@ self: super: with self; { dufte = callPackage ../development/python-modules/dufte { }; - dugong = callPackage ../development/python-modules/dugong { }; - dukpy = callPackage ../development/python-modules/dukpy { }; dulwich = callPackage ../development/python-modules/dulwich {