diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-17 14:57:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-17 14:57:20 +0200 |
commit | b19d8e0fcd121f1eb34feb18553859e9bf3050e8 (patch) | |
tree | 133192be3185b87b3e8a6641e6808cf5b3525828 | |
parent | 5f14933c33807c9f39ab74c6b1687feddd4dc949 (diff) | |
download | nixlib-b19d8e0fcd121f1eb34feb18553859e9bf3050e8.tar nixlib-b19d8e0fcd121f1eb34feb18553859e9bf3050e8.tar.gz nixlib-b19d8e0fcd121f1eb34feb18553859e9bf3050e8.tar.bz2 nixlib-b19d8e0fcd121f1eb34feb18553859e9bf3050e8.tar.lz nixlib-b19d8e0fcd121f1eb34feb18553859e9bf3050e8.tar.xz nixlib-b19d8e0fcd121f1eb34feb18553859e9bf3050e8.tar.zst nixlib-b19d8e0fcd121f1eb34feb18553859e9bf3050e8.zip |
Remove obsolete pre-systemd compat stuff
-rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 0df0e57c98e9..9eba728c3390 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 2e5598711859..8ab59423da23 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 { }; |