Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0b04ed61771d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08e8701673a8
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on May 7, 2018

  1. lib.types: fix loaOf behavior for long lists 

    Assigning a list of 10 or more elements to an option having the type
`loaOf a` produces a configuration value that is not honoring the
order of the original list. This commit fixes this and a related issue
arising when 10 or more lists are merged into this type of option.
    @rycee
    rycee committed May 7, 2018
    Copy the full SHA
    08e8701 View commit details
Showing with 64 additions and 9 deletions.
  1. +6 −0 lib/tests/modules.sh
  2. +19 −0 lib/tests/modules/loaOf-with-long-list.nix
  3. +19 −0 lib/tests/modules/loaOf-with-many-list-merges.nix
  4. +20 −9 lib/types.nix
6 changes: 6 additions & 0 deletions lib/tests/modules.sh
View file
Original file line number Diff line number Diff line change
@@ -143,6 +143,12 @@ checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix

# Check loaOf with long list.
checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix

# Check loaOf with many merges of lists.
checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix

cat <<EOF
====== module tests ======
$pass Pass
19 changes: 19 additions & 0 deletions lib/tests/modules/loaOf-with-long-list.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{ config, lib, ... }:

{
options = {
loaOfInt = lib.mkOption {
type = lib.types.loaOf lib.types.int;
};

result = lib.mkOption {
type = lib.types.str;
};
};

config = {
loaOfInt = [ 1 2 3 4 5 6 7 8 9 10 ];

result = toString (lib.attrValues config.loaOfInt);
};
}
19 changes: 19 additions & 0 deletions lib/tests/modules/loaOf-with-many-list-merges.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{ config, lib, ... }:

{
options = {
loaOfInt = lib.mkOption {
type = lib.types.loaOf lib.types.int;
};

result = lib.mkOption {
type = lib.types.str;
};
};

config = {
loaOfInt = lib.mkMerge (map lib.singleton [ 1 2 3 4 5 6 7 8 9 10 ]);

result = toString (lib.attrValues config.loaOfInt);
};
}
29 changes: 20 additions & 9 deletions lib/types.nix
View file
Original file line number Diff line number Diff line change
@@ -280,15 +280,26 @@ rec {
# List or attribute set of ...
loaOf = elemType:
let
convertIfList = defIdx: def:
convertAllLists = defs:
let
padWidth = stringLength (toString (length defs));
unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + ".";
in
imap1 (i: convertIfList (unnamedPrefix i)) defs;

convertIfList = unnamedPrefix: def:
if isList def.value then
{ inherit (def) file;
value = listToAttrs (
imap1 (elemIdx: elem:
{ name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
value = elem;
}) def.value);
}
let
padWidth = stringLength (toString (length def.value));
unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;
in
{ inherit (def) file;
value = listToAttrs (
imap1 (elemIdx: elem:
{ name = elem.name or (unnamed elemIdx);
value = elem;
}) def.value);
}
else
def;
listOnly = listOf elemType;
@@ -297,7 +308,7 @@ rec {
name = "loaOf";
description = "list or attribute set of ${elemType.description}s";
check = x: isList x || isAttrs x;
merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs);
merge = loc: defs: attrOnly.merge loc (convertAllLists defs);
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
getSubModules = elemType.getSubModules;
substSubModules = m: loaOf (elemType.substSubModules m);