mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-15 17:51:01 +00:00
Code Activity

Merge pull request #205 from Mic92/nix-daemon

Browse source 
nix: better defaults settings for maxJobs/buildCores
This commit is contained in:
Daiderd Jordan 2020-05-30 13:11:46 +02:00 committed by GitHub
commit 5c7d050e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/examples/lnl.nix
View file

@ -469,9 +469,4 @@
users.nix.configureBuildUsers = true; users.nix.configureBuildUsers = true;
users.nix.nrBuildUsers = 32; users.nix.nrBuildUsers = 32;
# You should generally set this to the total number of logical cores in your system.
# $ sysctl -n hw.ncpu
nix.maxJobs = 1;
nix.buildCores = 1;
} }

5
modules/examples/ofborg.nix
View file

@ -26,9 +26,4 @@ with lib;
# Used for backwards compatibility, please read the changelog before changing. # Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog # $ darwin-rebuild changelog
system.stateVersion = 4; system.stateVersion = 4;
# You should generally set this to the total number of logical cores in your system.
# $ sysctl -n hw.ncpu
nix.maxJobs = 1;
nix.buildCores = 1;
} }

5
modules/examples/simple.nix
View file

@ -23,9 +23,4 @@
# Used for backwards compatibility, please read the changelog before changing. # Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog # $ darwin-rebuild changelog
system.stateVersion = 4; system.stateVersion = 4;
# You should generally set this to the total number of logical cores in your system.
# $ sysctl -n hw.ncpu
nix.maxJobs = 1;
nix.buildCores = 1;
} }

17
modules/nix/default.nix
View file

@ -82,24 +82,25 @@ in
}; };
nix.maxJobs = mkOption { nix.maxJobs = mkOption {
type = types.int; type = types.either types.int (types.enum ["auto"]);
default = 1; default = "auto";
example = 64; example = 64;
description = '' description = ''
This option defines the maximum number of jobs that Nix will try This option defines the maximum number of jobs that Nix will try to
to build in parallel. The default is 1. You should generally build in parallel. The default is auto, which means it will use all
set it to the total number of logical cores in your system (e.g., 16 available logical cores. It is recommend to set it to the total
for two CPUs with 4 cores each and hyper-threading). number of logical cores in your system (e.g., 16 for two CPUs with 4
cores each and hyper-threading).
''; '';
}; };
nix.buildCores = mkOption { nix.buildCores = mkOption {
type = types.int; type = types.int;
default = 1; default = 0;
example = 64; example = 64;
description = '' description = ''
This option defines the maximum number of concurrent tasks during This option defines the maximum number of concurrent tasks during
one build. It affects, e.g., -j option for make. The default is 1. one build. It affects, e.g., -j option for make.
The special value 0 means that the builder should use all The special value 0 means that the builder should use all
available CPU cores in the system. Some builds may become available CPU cores in the system. Some builds may become
non-deterministic with this option; use with care! Packages will non-deterministic with this option; use with care! Packages will