diff options
author | lethalman <lucabru@src.gnome.org> | 2015-03-30 18:06:53 +0200 |
---|---|---|
committer | lethalman <lucabru@src.gnome.org> | 2015-03-30 18:06:53 +0200 |
commit | f72b0c43f661171a48db982a864097fafe3bdac7 (patch) | |
tree | c935bc41aa395034973c4264e01dcfab5a9c3a39 | |
parent | fed2cf85ec5ac1b7806d7caecc9df549bc717baa (diff) | |
parent | fe6b0b15e6f4a346a204f72310e0914ba7edc941 (diff) | |
download | nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.gz nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.bz2 nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.lz nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.xz nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.zst nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.zip |
Merge pull request #6762 from lethalman/nixos-install
nixos-install: support -j, --cores and --option. Closes #6755
-rw-r--r-- | nixos/doc/manual/man-nixos-install.xml | 47 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 11 |
2 files changed, 55 insertions, 3 deletions
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 06e7b4a98470..7ad1be1ec105 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -26,6 +26,22 @@ <replaceable>root</replaceable> </arg> <arg> + <group choice='req'> + <arg choice='plain'><option>--max-jobs</option></arg> + <arg choice='plain'><option>-j</option></arg> + </group> + <replaceable>number</replaceable> + </arg> + <arg> + <option>--cores</option> + <replaceable>number</replaceable> + </arg> + <arg> + <option>--option</option> + <replaceable>name</replaceable> + <replaceable>value</replaceable> + </arg> + <arg> <arg choice='plain'><option>--show-trace</option></arg> </arg> <arg> @@ -96,6 +112,37 @@ it.</para> </listitem> </varlistentry> + <varlistentry><term><option>--max-jobs</option></term> + <term><option>-j</option></term> + + <listitem><para>Sets the maximum number of build jobs that Nix will + perform in parallel to the specified number. The default is <literal>1</literal>. + A higher value is useful on SMP systems or to exploit I/O latency.</para></listitem> + + </varlistentry> + + + <varlistentry><term><option>--cores</option></term> + + <listitem><para>Sets the value of the <envar>NIX_BUILD_CORES</envar> + environment variable in the invocation of builders. Builders can + use this variable at their discretion to control the maximum amount + of parallelism. For instance, in Nixpkgs, if the derivation + attribute <varname>enableParallelBuilding</varname> is set to + <literal>true</literal>, the builder passes the + <option>-j<replaceable>N</replaceable></option> flag to GNU Make. + The value <literal>0</literal> means that the builder should use all + available CPU cores in the system.</para></listitem> + + </varlistentry> + + <varlistentry><term><option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term> + + <listitem><para>Set the Nix configuration option + <replaceable>name</replaceable> to <replaceable>value</replaceable>.</para></listitem> + + </varlistentry> + <varlistentry> <term><option>--show-trace</option></term> <listitem> diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 8f3de10c6133..1ccd6547df5e 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -28,9 +28,14 @@ chrootCommand=(/run/current-system/sw/bin/bash) while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in - -I) - given_path="$1"; shift 1 - extraBuildFlags+=("$i" "$given_path") + --max-jobs|-j|--cores|-I) + j="$1"; shift 1 + extraBuildFlags+=("$i" "$j") + ;; + --option) + j="$1"; shift 1 + k="$1"; shift 1 + extraBuildFlags+=("$i" "$j" "$k") ;; --root) mountPoint="$1"; shift 1 |