summary refs log tree commit diff
path: root/nixos/modules/services/development
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2018-08-07 18:53:56 +0200
committerSilvan Mosberger <contact@infinisil.com>2021-01-24 17:18:37 +0100
commit8ac4b251c8a319909a29aa103101eeed82ca7d3e (patch)
tree4166bda474d7032eda56d591237b9e96746a5c6f /nixos/modules/services/development
parent43243539b33d8fb0b2d14a3f9b79d6b641b74e2c (diff)
downloadnixpkgs-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar
nixpkgs-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.gz
nixpkgs-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.bz2
nixpkgs-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.lz
nixpkgs-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.xz
nixpkgs-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.zst
nixpkgs-8ac4b251c8a319909a29aa103101eeed82ca7d3e.zip
nixos: use functionTo to prevent evaluation errors while merging
Without this patch merging options like
services.xserver.windowManager.xmonad.extraPackages
results in the evaluation error:

  error: value is a list while a set was expected, at nixpkgs/lib/options.nix:77:23

With this patch we get the desired merging behaviour that just concatenates the
resulting package lists.

(cherry picked from commit 6e99f9fdecb1f28308c8e0aed0fc851737354864)

Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
Diffstat (limited to 'nixos/modules/services/development')
-rw-r--r--nixos/modules/services/development/hoogle.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix
index a661e3acae3..6d6c88b9b2a 100644
--- a/nixos/modules/services/development/hoogle.nix
+++ b/nixos/modules/services/development/hoogle.nix
@@ -25,6 +25,7 @@ in {
     };
 
     packages = mkOption {
+      type = types.functionTo (types.listOf types.package);
       default = hp: [];
       defaultText = "hp: []";
       example = "hp: with hp; [ text lens ]";