From 982fe358cae9f81585b4b68b6d80986cee542a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 9 May 2024 09:50:32 +0200 Subject: [PATCH] python3Packages.pyrad: update to `2.4-unstable-2023-06-13` --- .../python-modules/pyrad/default.nix | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 1ecc28cce459..9e2cb672d95a 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchFromGitHub, - fetchpatch, lib, poetry-core, netaddr, @@ -23,42 +22,27 @@ in buildPythonPackage rec { pname = "pyrad"; - version = "2.4"; + version = "2.4-unstable-2023-06-13"; format = "pyproject"; src = fetchFromGitHub { owner = "pyradius"; repo = pname; - rev = version; - hash = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; + rev = "dd34c5a29b46d83b0bea841e85fd72b79f315b87"; + hash = "sha256-U4VVGkDDyN4J/tRDaDGSr2TSA4JmqIoQj5qn9qBAvQU="; }; - patches = [ - (fetchpatch { - # Migrate to poetry-core - url = "https://github.com/pyradius/pyrad/commit/a4b70067dd6269e14a2f9530d820390a8a454231.patch"; - hash = "sha256-1We9wrVY3Or3GLIKK6hZvEjVYv6JOaahgP9zOMvgErE="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ netaddr_0_8_0 six ]; + preCheck = '' substituteInPlace tests/testServer.py \ --replace-warn "def testBind(self):" "def dontTestBind(self):" \ --replace-warn "def testBindv6(self):" "def dontTestBindv6(self):" \ - - # A lot of test methods have been deprecated since Python 3.1 - # and have been removed in Python 3.12. - # https://docs.python.org/3/whatsnew/3.11.html#pending-removal-in-python-3-12 - substituteInPlace tests/*.py \ - --replace-quiet "self.failUnless" "self.assertTrue" \ - --replace-quiet "self.failIf" "self.assertFalse" \ - --replace-quiet "self.assertEquals" "self.assertEqual" ''; nativeCheckInputs = [ unittestCheckHook ];