From 863c2bdf36e3f021a6ca04f384f5267e10410c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?= Date: Sun, 9 Mar 2025 20:44:35 +0100 Subject: [PATCH] vpn-slice: fix script startup with python > 3.11 on darwin, modernize a little (#385356) --- pkgs/tools/networking/vpn-slice/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index ea23ece8b5de..2d0c25c578fc 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -13,10 +13,11 @@ buildPythonApplication rec { pname = "vpn-slice"; version = "0.16.1"; + pyproject = true; src = fetchFromGitHub { owner = "dlenski"; - repo = pname; + repo = "vpn-slice"; rev = "v${version}"; sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs="; }; @@ -24,15 +25,20 @@ buildPythonApplication rec { postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace vpn_slice/mac.py \ - --replace "'/sbin/route'" "'${unixtools.route}/bin/route'" + --replace-fail "'/sbin/route'" "'${unixtools.route}/bin/route'" '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace vpn_slice/linux.py \ - --replace "'/sbin/ip'" "'${iproute2}/bin/ip'" \ - --replace "'/sbin/iptables'" "'${iptables}/bin/iptables'" + --replace-fail "'/sbin/ip'" "'${iproute2}/bin/ip'" \ + --replace-fail "'/sbin/iptables'" "'${iptables}/bin/iptables'" ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + setuptools # can be removed with next package update, upstream no longer has a dependency on distutils setproctitle dnspython ];