public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

types: remove references to new packageSet

Browse Source 
Reverts part of a04a7272aa38ada45e694281071b720d4abbd0df

packageSet is slated to be introduced in #11866 but currently causes
evalation errors.

/cc @ts468
This commit is contained in:
Robin Gloster 2016-01-17 19:49:38 +00:00
parent 00eeae1179
commit 4a0692a5fb
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/window-managers/xmonad.nix
View File

@ -16,7 +16,6 @@ in
services.xserver.windowManager.xmonad = { services.xserver.windowManager.xmonad = {
enable = mkEnableOption "xmonad"; enable = mkEnableOption "xmonad";
haskellPackages = mkOption { haskellPackages = mkOption {
type = lib.types.packageSet;
default = pkgs.haskellPackages; default = pkgs.haskellPackages;
defaultText = "pkgs.haskellPackages"; defaultText = "pkgs.haskellPackages";
example = literalExample "pkgs.haskell.packages.ghc784"; example = literalExample "pkgs.haskell.packages.ghc784";

1
nixos/modules/system/boot/kernel.nix
View File

@ -20,7 +20,6 @@ in
options = { options = {
boot.kernelPackages = mkOption { boot.kernelPackages = mkOption {
type = types.packageSet;
default = pkgs.linuxPackages; default = pkgs.linuxPackages;
# We don't want to evaluate all of linuxPackages for the manual # We don't want to evaluate all of linuxPackages for the manual
# - some of it might not even evaluate correctly. # - some of it might not even evaluate correctly.