diff options
| author | Robin Gloster <mail@glob.in> | 2016-01-17 19:49:38 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-01-17 19:49:38 +0000 |
| commit | 4a0692a5fb9dc38b49deeda174c37a0864e052f3 (patch) | |
| tree | e413dbd71f69b20a1528c61cdc6787fdd3d43432 | |
| parent | 00eeae1179eb86445f5f6812349dfd120d230118 (diff) | |
| download | nixpkgs-4a0692a5fb9dc38b49deeda174c37a0864e052f3.tar nixpkgs-4a0692a5fb9dc38b49deeda174c37a0864e052f3.tar.gz nixpkgs-4a0692a5fb9dc38b49deeda174c37a0864e052f3.tar.bz2 nixpkgs-4a0692a5fb9dc38b49deeda174c37a0864e052f3.tar.lz nixpkgs-4a0692a5fb9dc38b49deeda174c37a0864e052f3.tar.xz nixpkgs-4a0692a5fb9dc38b49deeda174c37a0864e052f3.tar.zst nixpkgs-4a0692a5fb9dc38b49deeda174c37a0864e052f3.zip | |
types: remove references to new packageSet
Reverts part of a04a7272aa38ada45e694281071b720d4abbd0df packageSet is slated to be introduced in #11866 but currently causes evalation errors. /cc @ts468
| -rw-r--r-- | nixos/modules/services/x11/window-managers/xmonad.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 588696dac15..6af88d4f645 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -16,7 +16,6 @@ in services.xserver.windowManager.xmonad = { enable = mkEnableOption "xmonad"; haskellPackages = mkOption { - type = lib.types.packageSet; default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; example = literalExample "pkgs.haskell.packages.ghc784"; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 03de445d782..6bc046d0261 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -20,7 +20,6 @@ in options = { boot.kernelPackages = mkOption { - type = types.packageSet; default = pkgs.linuxPackages; # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. |