diff options
author | pennae <github@quasiparticle.net> | 2021-11-26 18:42:03 +0100 |
---|---|---|
committer | pennae <github@quasiparticle.net> | 2021-11-30 19:51:45 +0100 |
commit | 5269674a6de416c9acd1981e199c20cd5c20b627 (patch) | |
tree | 06a1797da776a0d6f2542381c12907a0b671f330 /pkgs/tools/networking/dhcpcd | |
parent | c18638dc95216b1b2930d16e1334613d82d05e8e (diff) | |
download | nixpkgs-5269674a6de416c9acd1981e199c20cd5c20b627.tar nixpkgs-5269674a6de416c9acd1981e199c20cd5c20b627.tar.gz nixpkgs-5269674a6de416c9acd1981e199c20cd5c20b627.tar.bz2 nixpkgs-5269674a6de416c9acd1981e199c20cd5c20b627.tar.lz nixpkgs-5269674a6de416c9acd1981e199c20cd5c20b627.tar.xz nixpkgs-5269674a6de416c9acd1981e199c20cd5c20b627.tar.zst nixpkgs-5269674a6de416c9acd1981e199c20cd5c20b627.zip |
dhcpcd: 8.1.4 -> 9.4.1
by @erictapen: - Removed note about testing and moved it to passthru.tests - Removed patch, as it is probably the same as 56b2bb17d2ec67e1f93950944211f6cf8c40e0fb, wich landed in upstream. other changes: - changed PIDFile in the module, since dhcpcd 9 changed the location
Diffstat (limited to 'pkgs/tools/networking/dhcpcd')
-rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 0962335ad1a..8927e8e76aa 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,15 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, udev, runtimeShellPackage, -runtimeShell }: +{ lib +, stdenv +, fetchurl +, pkg-config +, udev +, runtimeShellPackage +, runtimeShell +, nixosTests +}: stdenv.mkDerivation rec { - # when updating this to >=7, check, see previous reverts: - # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.1.4"; + version = "9.4.1"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0gf1qif25wy5lffzw39pi4sshmpxz1f4a1m9sglj7am1gaix3817"; + sha256 = "sha256-gZNXY07+0epc9E7AGyTT0/iFL+yLQkmSXcxWZ8VON2w="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,14 +27,6 @@ stdenv.mkDerivation rec { substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} ''; - patches = [ - (fetchpatch { - name = "?id=114870290a8d3d696bc4049c32eef3eed03d6070"; - url = "https://roy.marples.name/git/dhcpcd/commitdiff_plain/114870290a8d3d696bc4049c32eef3eed03d6070"; - sha256 = "0kzpwjh2gzvl5lvlnw6lis610p67nassk3apns68ga2pyxlky8qb"; - }) - ]; - preConfigure = "patchShebangs ./configure"; configureFlags = [ @@ -46,6 +43,8 @@ stdenv.mkDerivation rec { # Check that the udev plugin got built. postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + passthru.tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; }; + meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = "https://roy.marples.name/projects/dhcpcd"; |