alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Manual: Remove store path references

Browse source
This commit is contained in:
Eelco Dolstra 2015-09-24 11:42:32 +02:00
parent e73b19ae4e
commit 89e983786a
13 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/config/shells-environment.nix
View file

@ -123,6 +123,7 @@ in
"''${pkgs.dash}/bin/dash"
'';
type = types.path;
visible = false;
description = ''
The shell executable that is linked system-wide to
<literal>/bin/sh</literal>. Please note that NixOS assumes all

3
nixos/modules/programs/ssh.nix
View file

@ -36,7 +36,6 @@ in
askPassword = mkOption {
type = types.str;
default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
description = ''Program used by SSH to ask for passwords.'';
};
@ -223,5 +222,7 @@ in
export SSH_ASKPASS=${askPassword}
'';
programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
};
}

3
nixos/modules/programs/venus.nix
View file

@ -99,7 +99,6 @@ in
};
outputTheme = mkOption {
default = "${pkgs.venus}/themes/classic_fancy";
type = types.path;
description = ''
Directory containing a config.ini file which is merged with this one.
@ -170,5 +169,7 @@ in
startAt = cfg.dates;
};
services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy";
};
}

3
nixos/modules/services/amqp/activemq/default.nix
View file

@ -32,7 +32,6 @@ in {
'';
};
configurationDir = mkOption {
default = "${activemq}/conf";
description = ''
The base directory for ActiveMQ's configuration.
By default, this directory is searched for a file named activemq.xml,
@ -126,6 +125,8 @@ in {
'';
};
services.activemq.configurationDir = mkDefault "${activemq}/conf";
};
}

3
nixos/modules/services/hardware/sane.nix
View file

@ -36,7 +36,6 @@ in
hardware.sane.configDir = mkOption {
type = types.string;
default = "${saneConfig}/etc/sane.d";
description = "The value of SANE_CONFIG_DIR.";
};
@ -47,6 +46,8 @@ in
config = mkIf config.hardware.sane.enable {
hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d";
environment.systemPackages = backends;
environment.sessionVariables = {
SANE_CONFIG_DIR = config.hardware.sane.configDir;

4
nixos/modules/services/logging/logstash.nix
View file

@ -84,10 +84,10 @@ in
type = types.lines;
default = ''stdin { type => "example" }'';
description = "Logstash input configuration.";
example = ''
example = literalExample ''
# Read from journal
pipe {
command => "${pkgs.systemd}/bin/journalctl -f -o json"
command => "''${pkgs.systemd}/bin/journalctl -f -o json"
type => "syslog" codec => json {}
}
'';

3
nixos/modules/services/misc/nixos-manual.nix
View file

@ -80,7 +80,6 @@ in
services.nixosManual.browser = mkOption {
type = types.path;
default = "${pkgs.w3m}/bin/w3m";
description = ''
Browser used to show the manual.
'';
@ -116,6 +115,8 @@ in
services.mingetty.helpLine = mkIf cfg.showManual
"\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m";
};
}

4
nixos/modules/services/misc/subsonic.nix
View file

@ -97,7 +97,6 @@ in
transcoders = mkOption {
type = types.listOf types.path;
default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
description = ''
List of paths to transcoder executables that should be accessible
from Subsonic. Symlinks will be created to each executable inside
@ -153,5 +152,8 @@ in
};
users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
};
}

6
nixos/modules/services/monitoring/grafana.nix
View file

@ -200,7 +200,6 @@ in {
staticRootPath = mkOption {
description = "Root path for static assets.";
default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public";
type = types.str;
};
@ -311,7 +310,7 @@ in {
config = mkIf cfg.enable {
warnings = [
"Grafana passwords will be stored as plaintext in nix store!"
"Grafana passwords will be stored as plaintext in the Nix store!"
];
systemd.services.grafana = {
@ -331,5 +330,8 @@ in {
home = cfg.dataDir;
createHome = true;
};
services.grafana.staticRootPath = mkDefault "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public";
};
}

5
nixos/modules/services/networking/dnscrypt-proxy.nix
View file

@ -52,10 +52,7 @@ in
default = "opendns";
type = types.nullOr types.string;
description = ''
The name of the upstream DNSCrypt resolver to use. See
<literal>${resolverListFile}</literal> for alternative resolvers
(e.g., if you are concerned about logging and/or server
location).
The name of the upstream DNSCrypt resolver to use.
'';
};
customResolver = mkOption {

2
nixos/modules/services/networking/seeks.nix
View file

@ -33,7 +33,7 @@ in
type = types.str;
description = "
The Seeks server configuration. If it is not specified,
a default configuration is used (${seeks}/etc/seeks).
a default configuration is used.
";
};

5
nixos/modules/services/web-servers/phpfpm.nix
View file

@ -44,8 +44,7 @@ in {
phpIni = mkOption {
type = types.path;
default = "${cfg.phpPackage}/etc/php-recommended.ini";
description = "php.ini file to use.";
description = "PHP configuration file to use.";
};
poolConfigs = mkOption {
@ -86,5 +85,7 @@ in {
};
};
services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini";
};
}

4
nixos/modules/services/x11/display-managers/lightdm.nix
View file

@ -104,7 +104,6 @@ in
};
background = mkOption {
default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
description = ''
The background image or color to use.
'';
@ -172,5 +171,8 @@ in
};
users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
};
}