python3Packages.pyrad: fix build failing
- Failing on ZHF https://hydra.nixos.org/build/258464455 - Fix netaddr to use the correct version - Fix use of deleted methods in python312 causing build fail
This commit is contained in:
parent
c459868572
commit
7e2cf7d352
1 changed files with 23 additions and 4 deletions
|
@ -6,7 +6,19 @@
|
||||||
, netaddr
|
, netaddr
|
||||||
, six
|
, six
|
||||||
, unittestCheckHook
|
, unittestCheckHook
|
||||||
|
, fetchPypi
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
netaddr_0_8_0 = netaddr.overridePythonAttrs (oldAttrs: rec {
|
||||||
|
version = "0.8.0";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
pname = "netaddr";
|
||||||
|
inherit version;
|
||||||
|
hash = "sha256-1sxXx6B7HZ0ukXqos2rozmHDW6P80bg8oxxaDuK1okM=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyrad";
|
pname = "pyrad";
|
||||||
|
@ -33,14 +45,21 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
netaddr
|
netaddr_0_8_0
|
||||||
six
|
six
|
||||||
];
|
];
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
substituteInPlace tests/testServer.py \
|
substituteInPlace tests/testServer.py \
|
||||||
--replace "def testBind(self):" "def dontTestBind(self):" \
|
--replace-warn "def testBind(self):" "def dontTestBind(self):" \
|
||||||
--replace "def testBindv6(self):" "def dontTestBindv6(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 = [
|
nativeCheckInputs = [
|
||||||
|
|
Loading…
Reference in a new issue