diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
commit | a5f5d020c69c22ddc6be48123ef4d30fd262c403 (patch) | |
tree | bfb79b323b549e1f10a94d0153fdd3761ae893a6 /nixos | |
parent | ed43d951af1030d01e22fe0aaaed568af4e7e8e9 (diff) | |
parent | bbe71613b6e656e707acdf9c279736c900bf4e87 (diff) | |
download | nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.gz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.bz2 nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.lz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.xz nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.zst nixlib-a5f5d020c69c22ddc6be48123ef4d30fd262c403.zip |
Merge branch 'staging-next'
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 11 | ||||
-rw-r--r-- | nixos/modules/system/boot/kernel_config.nix | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8bf9c16e6f8a..40316b980f3b 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -492,6 +492,17 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; </listitem> <listitem> <para> + The cc- and binutils-wrapper's "infix salt" and <literal>_BUILD_</literal> and <literal>_TARGET_</literal> user infixes have been replaced with with a "suffix salt" and suffixes and <literal>_FOR_BUILD</literal> and <literal>_FOR_TARGET</literal>. + This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. + </para> + </listitem> + <listitem> + <para> + Additional Git documentation (HTML and text files) is now available via the <literal>git-doc</literal> package. + </para> + </listitem> + <listitem> + <para> Default algorithm for ZRAM swap was changed to <literal>zstd</literal>. </para> </listitem> diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix index a316782dfc57..85bd420e3044 100644 --- a/nixos/modules/system/boot/kernel_config.nix +++ b/nixos/modules/system/boot/kernel_config.nix @@ -22,7 +22,7 @@ let mergeFalseByDefault = locs: defs: if defs == [] then abort "This case should never happen." - else if any (x: x == false) defs then false + else if any (x: x == false) (getValues defs) then false else true; kernelItem = types.submodule { @@ -55,6 +55,7 @@ let default = false; description = '' Wether option should generate a failure when unused. + Upon merging values, mandatory wins over optional. ''; }; }; @@ -121,7 +122,7 @@ in type = types.attrsOf kernelItem; example = literalExample '' with lib.kernel; { "9P_NET" = yes; - USB = optional yes; + USB = option yes; MMC_BLOCK_MINORS = freeform "32"; }''; description = '' |