diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-07 18:53:56 +0200 |
---|---|---|
committer | Silvan Mosberger <contact@infinisil.com> | 2021-01-24 17:18:37 +0100 |
commit | 8ac4b251c8a319909a29aa103101eeed82ca7d3e (patch) | |
tree | 4166bda474d7032eda56d591237b9e96746a5c6f /nixos/modules | |
parent | 43243539b33d8fb0b2d14a3f9b79d6b641b74e2c (diff) | |
download | nixlib-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar nixlib-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.gz nixlib-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.bz2 nixlib-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.lz nixlib-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.xz nixlib-8ac4b251c8a319909a29aa103101eeed82ca7d3e.tar.zst nixlib-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')
-rw-r--r-- | nixos/modules/services/development/hoogle.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/misc/gitit.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/misc/ihaskell.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/misc/octoprint.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/netdata.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/networking/supybot.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/x11/window-managers/exwm.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/x11/window-managers/xmonad.nix | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index a661e3acae3e..6d6c88b9b2aa 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 ]"; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 1ec030549f98..f09565283f3c 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -42,6 +42,7 @@ let }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 684a242d7385..c7332b87803a 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -21,6 +21,7 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index a69e65073050..5a64946f9f63 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -66,6 +66,7 @@ in }; plugins = mkOption { + type = types.functionTo (types.listOf types.package); default = plugins: []; defaultText = "plugins: []"; example = literalExample "plugins: with plugins; [ themeify stlviewer ]"; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index db51fdbd2c61..d5b679097b30 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -77,6 +77,7 @@ in { ''; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = ps: []; defaultText = "ps: []"; example = literalExample '' diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 864c3319c547..332c3ced06f0 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -64,6 +64,7 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = p: []; description = '' Extra Python packages available to supybot plugins. The diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 3e97d28d83b5..0743f35c1d31 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -37,6 +37,7 @@ in description = "Enable an uncustomised exwm configuration."; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' epkgs: [ diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 2bb4827be9d5..fe8ed3812511 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -53,6 +53,7 @@ in { }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; defaultText = "self: []"; example = literalExample '' |