nixos: set all package options to have type package

This commit is contained in:
Domen Kožar 2014-02-27 13:22:04 +01:00
parent f7c04b1e6b
commit 97a0dd9eb9
9 changed files with 9 additions and 4 deletions

View File

@ -77,7 +77,7 @@ in {
}; };
package = mkOption { package = mkOption {
type = types.path; type = types.package;
default = pulseaudio; default = pulseaudio;
example = literalExample "pulseaudio.override { jackaudioSupport = true; }"; example = literalExample "pulseaudio.override { jackaudioSupport = true; }";
description = '' description = ''

View File

@ -49,6 +49,7 @@ in
package = mkOption { package = mkOption {
default = pkgs.firebirdSuper; default = pkgs.firebirdSuper;
type = types.package;
/* /*
Example: <code>package = pkgs.firebirdSuper.override { icu = Example: <code>package = pkgs.firebirdSuper.override { icu =
pkgs.icu; };</code> which is not recommended for compatibility pkgs.icu; };</code> which is not recommended for compatibility

View File

@ -39,6 +39,7 @@ in
package = mkOption { package = mkOption {
default = pkgs.mongodb; default = pkgs.mongodb;
type = types.package;
description = " description = "
Which MongoDB derivation to use. Which MongoDB derivation to use.
"; ";

View File

@ -55,7 +55,7 @@ in
}; };
package = mkOption { package = mkOption {
type = types.path; type = types.package;
example = literalExample "pkgs.postgresql92"; example = literalExample "pkgs.postgresql92";
description = '' description = ''
PostgreSQL package to use. PostgreSQL package to use.

View File

@ -45,6 +45,7 @@ in
package = mkOption { package = mkOption {
default = pkgs.redis; default = pkgs.redis;
description = "Which Redis derivation to use."; description = "Which Redis derivation to use.";
type = types.package;
}; };
user = mkOption { user = mkOption {

View File

@ -42,6 +42,7 @@ in
package = mkOption { package = mkOption {
default = pkgs.cgminer; default = pkgs.cgminer;
description = "Which cgminer derivation to use."; description = "Which cgminer derivation to use.";
type = types.package;
}; };
user = mkOption { user = mkOption {

View File

@ -58,7 +58,7 @@ in
nix = { nix = {
package = mkOption { package = mkOption {
type = types.path; type = types.package;
default = pkgs.nix; default = pkgs.nix;
description = '' description = ''
This option specifies the Nix package instance to use throughout the system. This option specifies the Nix package instance to use throughout the system.

View File

@ -419,7 +419,7 @@ in
}; };
package = mkOption { package = mkOption {
type = types.path; type = types.package;
default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; }; default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
example = "pkgs.apacheHttpd_2_4"; example = "pkgs.apacheHttpd_2_4";
description = '' description = ''

View File

@ -25,6 +25,7 @@ in
package = mkOption { package = mkOption {
default = pkgs.nginx; default = pkgs.nginx;
type = types.package;
description = " description = "
Nginx package to use. Nginx package to use.
"; ";