gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: Use checks instead of extraDependencies

Browse Source 
... as appropriate.

This drops a few unnecessary store paths from the system closure.
This commit is contained in:
Robert Hensing
2023-05-11 18:42:17 +02:00
parent 5bdf63819b
commit 2e2f0d28ea
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/security/wrappers/default.nix
View File

@@ -283,7 +283,7 @@ in
''; '';
###### wrappers consistency checks ###### wrappers consistency checks
system.extraDependencies = lib.singleton (pkgs.runCommandLocal system.checks = lib.singleton (pkgs.runCommandLocal
"ensure-all-wrappers-paths-exist" { } "ensure-all-wrappers-paths-exist" { }
'' ''
# make sure we produce output # make sure we produce output

2
nixos/modules/services/databases/postgresql.nix
View File

@@ -489,7 +489,7 @@ in
"/share/postgresql" "/share/postgresql"
]; ];
system.extraDependencies = lib.optional (cfg.checkConfig && pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) configFileCheck; system.checks = lib.optional (cfg.checkConfig && pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) configFileCheck;
systemd.services.postgresql = systemd.services.postgresql =
{ description = "PostgreSQL Server"; { description = "PostgreSQL Server";

2
nixos/modules/services/web-servers/varnish/default.nix
View File

@@ -99,7 +99,7 @@ in
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
# check .vcl syntax at compile time (e.g. before nixops deployment) # check .vcl syntax at compile time (e.g. before nixops deployment)
system.extraDependencies = mkIf cfg.enableConfigCheck [ system.checks = mkIf cfg.enableConfigCheck [
(pkgs.runCommand "check-varnish-syntax" {} '' (pkgs.runCommand "check-varnish-syntax" {} ''
${cfg.package}/bin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1) ${cfg.package}/bin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)
'') '')

2
nixos/modules/services/x11/xserver.nix
View File

@@ -776,7 +776,7 @@ in
xorg.xf86inputevdev.out xorg.xf86inputevdev.out
]; ];
system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" { system.checks = singleton (pkgs.runCommand "xkb-validated" {
inherit (cfg) xkbModel layout xkbVariant xkbOptions; inherit (cfg) xkbModel layout xkbVariant xkbOptions;
nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ]; nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ];
preferLocalBuild = true; preferLocalBuild = true;