From b19d8e0fcd121f1eb34feb18553859e9bf3050e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Oct 2013 14:57:20 +0200 Subject: [PATCH] Remove obsolete pre-systemd compat stuff --- nixos/modules/misc/nixpkgs.nix | 14 -------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 0df0e57c98e..9eba728c339 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -70,18 +70,4 @@ in }; }; - - config = { - - # FIXME - nixpkgs.config.packageOverrides = pkgs: { - #udev = pkgs.systemd; - slim = pkgs.slim.override (args: if args ? consolekit then { consolekit = null; } else { }); - lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; }; - upower = pkgs.upower.override { useSystemd = true; }; - polkit = pkgs.polkit.override { useSystemd = true; }; - consolekit = null; - }; - - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e559871185..8ab59423da2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7007,7 +7007,7 @@ let upower = callPackage ../os-specific/linux/upower { libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {}; - }; + }; upstart = callPackage ../os-specific/linux/upstart { };