From da774bced5ed308c0393d7bb2c542fc84278b4bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Apr 2014 15:36:06 +0200 Subject: [PATCH] Remove dhcpcd_without_udev attribute --- nixos/modules/services/networking/dhcpcd.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 920c4d173e4..35a3cfff840 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -4,7 +4,7 @@ with lib; let - dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd_without_udev; + dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; }; # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144651fe2eb..0d81df6c31d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -827,8 +827,6 @@ let dhcpcd = callPackage ../tools/networking/dhcpcd { }; - dhcpcd_without_udev = callPackage ../tools/networking/dhcpcd { udev = null; }; - diffstat = callPackage ../tools/text/diffstat { }; diffutils = callPackage ../tools/text/diffutils { };