From dcb9d2286d5aac860f4067b5e11573a0a46c1c6f Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 8 Sep 2025 00:21:12 +0000 Subject: [PATCH 1/2] python3Packages.netaddr: fix static build --- pkgs/development/python-modules/netaddr/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 0a9c8457e96d..3d9f96b1c4cd 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -19,6 +20,18 @@ buildPythonPackage rec { hash = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; }; + # Test suite uses internal packaging._musllinux module to detect libc flavor. The module assumes + # the python executable is dynamically linked - it then attempts to parse linked library name to + # detect musl. It won't work on a static build. + postPatch = + if (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isStatic) then + '' + substituteInPlace netaddr/tests/__init__.py \ + --replace-fail "IS_MUSL = _get_musl_version(sys.executable) is not None" "IS_MUSL = True" + '' + else + null; + nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From 4dfe73957680dc8fd8bb811c377b4717917eeca8 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 8 Sep 2025 00:23:39 +0000 Subject: [PATCH 2/2] python3Packages.netaddr: modernize --- pkgs/development/python-modules/netaddr/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 3d9f96b1c4cd..f2f244118236 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, pytestCheckHook, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; @@ -32,7 +29,7 @@ buildPythonPackage rec { else null; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ];