summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nixos/modules/programs/ssh.nix3
-rw-r--r--nixos/modules/programs/venus.nix3
-rw-r--r--nixos/modules/services/amqp/activemq/default.nix3
-rw-r--r--nixos/modules/services/misc/nixos-manual.nix31
-rw-r--r--nixos/modules/services/misc/subsonic.nix4
-rw-r--r--nixos/modules/services/monitoring/grafana.nix4
-rw-r--r--nixos/modules/services/networking/dnscrypt-proxy.nix5
-rw-r--r--nixos/modules/services/web-servers/phpfpm.nix5
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix4
-rw-r--r--pkgs/development/libraries/webkitgtk/default.nix11
10 files changed, 44 insertions, 29 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 169c6a38e75b..1ad45f468030 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -36,6 +36,7 @@ in
askPassword = mkOption {
type = types.str;
+ default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
description = ''Program used by SSH to ask for passwords.'';
};
@@ -226,7 +227,5 @@ in
environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
- programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
-
};
}
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 76827eeced6f..731ebed14c7b 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -99,6 +99,7 @@ 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.
@@ -168,7 +169,5 @@ in
startAt = cfg.dates;
};
- services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy";
-
};
}
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 56ff388f8a9e..261f97617664 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -32,6 +32,7 @@ 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,
@@ -125,8 +126,6 @@ in {
'';
};
- services.activemq.configurationDir = mkDefault "${activemq}/conf";
-
};
}
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 79943a21224b..37ea339300d4 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -17,16 +17,32 @@ let
nixpkgs.system = config.nixpkgs.system;
};
- eval = evalModules {
- modules = [ versionModule ] ++ baseModules;
- args = (config._module.args) // { modules = [ ]; };
- };
-
+ /* For the purpose of generating docs, evaluate options with each derivation
+ in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
+ It isn't perfect, but it seems to cover a vast majority of use cases.
+ Caveat: even if the package is reached by a different means,
+ the path above will be shown and not e.g. `${config.services.foo.package}`. */
manual = import ../../../doc/manual {
inherit pkgs;
version = config.system.nixosVersion;
revision = config.system.nixosRevision;
- options = eval.options;
+ options =
+ let
+ scrubbedEval = evalModules {
+ modules = [ versionModule ] ++ baseModules;
+ args = (config._module.args) // { modules = [ ]; };
+ specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
+ };
+ scrubDerivations = namePrefix: pkgSet: mapAttrs
+ (name: value:
+ let wholeName = "${namePrefix}.${name}"; in
+ if isAttrs value then
+ scrubDerivations wholeName value
+ // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
+ else value
+ )
+ pkgSet;
+ in scrubbedEval.options;
};
entry = "${manual.manual}/share/doc/nixos/index.html";
@@ -81,6 +97,7 @@ in
services.nixosManual.browser = mkOption {
type = types.path;
+ default = "${pkgs.w3m-nox}/bin/w3m";
description = ''
Browser used to show the manual.
'';
@@ -118,8 +135,6 @@ in
services.mingetty.helpLine = mkIf cfg.showManual
"\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
- services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m";
-
};
}
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 2831e95b9480..020d53a481de 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -97,6 +97,7 @@ 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
@@ -152,8 +153,5 @@ in
};
users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
-
- services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
-
};
}
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 0b49038dd273..1dec528b5a2c 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -87,6 +87,7 @@ in {
staticRootPath = mkOption {
description = "Root path for static assets.";
+ default = "${cfg.package.out}/share/grafana/public";
type = types.str;
};
@@ -232,8 +233,5 @@ in {
home = cfg.dataDir;
createHome = true;
};
-
- services.grafana.staticRootPath = mkDefault "${cfg.package}/share/grafana/public";
-
};
}
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 218bce2dbb31..c724ee979c2d 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -52,7 +52,10 @@ in
default = "opendns";
type = types.nullOr types.string;
description = ''
- The name of the upstream DNSCrypt resolver to use.
+ 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).
'';
};
customResolver = mkOption {
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 1b1f3b8d5d0e..6a60000ce19e 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -46,7 +46,8 @@ in {
phpIni = mkOption {
type = types.path;
- description = "PHP configuration file to use.";
+ default = "${cfg.phpPackage}/etc/php-recommended.ini";
+ description = "php.ini file to use.";
};
poolConfigs = mkOption {
@@ -88,7 +89,5 @@ in {
};
};
- services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini";
-
};
}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 3949bf01a316..ac7db3d9adc4 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -87,6 +87,7 @@ in
background = mkOption {
type = types.str;
+ default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
description = ''
The background image or color to use.
'';
@@ -152,9 +153,6 @@ in
};
users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
-
- services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
-
services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves..
services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
};
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 4df1ba71c11f..fc40e7749e91 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
+{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, cmake
, pkgconfig, gettext, gobjectIntrospection, libnotify
, gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
@@ -28,7 +28,14 @@ stdenv.mkDerivation rec {
sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v";
};
- patches = [ ./finding-harfbuzz-icu.patch ];
+ patches = [ ./finding-harfbuzz-icu.patch
+ (fetchpatch {
+ name = "glibc-isnan.patch";
+ url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore"
+ + "/runtime/Options.cpp?format=diff&new=194518";
+ sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm";
+ })
+ ];
cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 01:48:44 +0000