From c534697174be56be7cb026fbdaf9ec973a090a7b Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 3 Sep 2023 21:31:25 +0800 Subject: [PATCH] dhcpcd: 9.4.1 -> 10.0.2 Remove upsteamed patch. --- pkgs/tools/networking/dhcpcd/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 40cfa4077227..01f52c50bc13 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , udev , runtimeShellPackage @@ -12,24 +11,15 @@ stdenv.mkDerivation rec { pname = "dhcpcd"; - version = "9.4.1"; + version = "10.0.3"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "dhcpcd"; rev = "v${version}"; - sha256 = "sha256-qyxON+TsAKMwAI19b5P+dT/sgxpW6m1giGcf/boFpHc="; + sha256 = "sha256-NXLOfSPGHiRDSagaT+37TAn9XtdcG4+wP9AvyGJi4Dc="; }; - patches = [ - # dhcpcd with privsep SIGSYS's on dhcpcd -U - # https://github.com/NetworkConfiguration/dhcpcd/issues/147 - (fetchpatch { - url = "https://github.com/NetworkConfiguration/dhcpcd/commit/38befd4e867583002b96ec39df733585d74c4ff5.patch"; - hash = "sha256-nS2zmLuQBYhLfoPp0DOwxF803Hh32EE4OUKGBTTukE0="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev