From 02850dd6b9e0320ab2f716e68602e1644fa70d7a Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 19 Nov 2023 11:22:11 +0000 Subject: [PATCH 1/2] python311Packages.pkg-about: remove unneeded tox dependancy; fix build tox is listed as a build requirement but it is never used. however, it is breaking the build due to a tox dependency, cachetools, failing a version check. Updating cachetools causes over 600 rebuilds. https://github.com/karpierz/pkg_about/blob/1.0.8/pyproject.toml --- pkgs/development/python-modules/pkg-about/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index b82712dc443f..2c1e92c75d84 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -7,7 +7,6 @@ , setuptools , packaging , tomli -, tox }: buildPythonPackage rec { @@ -24,10 +23,15 @@ buildPythonPackage rec { hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA="; }; + # tox is listed in build requirements but not actually used to build + # keeping it as a requirement breaks the build unnecessarily + postPatch = '' + sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml + ''; + nativeBuildInputs = [ packaging setuptools - tox ]; propagatedBuildInputs = [ From ef5c4d73b0adb931e23b86b6f56fcc807a38d988 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 19 Nov 2023 11:38:41 +0000 Subject: [PATCH 2/2] python311Packages.libpcap: remove unneeded tox dependancy; fix build tox is listed as a build requirement but it is never used. however, it is breaking the build due to a tox dependency, cachetools, failing a version check. Updating cachetools causes over 600 rebuilds. https://github.com/karpierz/libpcap/blob/1.11.0b7/pyproject.toml --- pkgs/development/python-modules/libpcap/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix index 1dbc2de90dfb..d094e7715fca 100644 --- a/pkgs/development/python-modules/libpcap/default.nix +++ b/pkgs/development/python-modules/libpcap/default.nix @@ -7,7 +7,6 @@ , pkgsLibpcap , pkg-about , setuptools -, tox }: buildPythonPackage rec { @@ -25,10 +24,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - tox ]; + # tox is listed in build requirements but not actually used to build + # keeping it as a requirement breaks the build unnecessarily postPatch = '' + sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml cat <src/libpcap/libpcap.cfg [libpcap] LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary}