manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sort partitions only by index

Browse source
This commit is contained in:
Manuel Thalmann 2024-07-07 13:08:21 +02:00
parent e9c4290176
commit 32dfdcc6c3
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/modules/partition/disks.nix
View file

@ -78,14 +78,9 @@
chooseDisk ${diskVarName} "Which disk do you wish to install the OS on?"; chooseDisk ${diskVarName} "Which disk do you wish to install the OS on?";
''; '';
partitions = builtins.foldl' partitions = lib.lists.sortOn
(list: predicate: lib.lists.sortOn predicate list) (_: _.index)
(builtins.filter (_: _ != null) (builtins.attrValues config.partitions)) (builtins.filter (_: _ != null) (builtins.attrValues config.partitions));
[
(_: _.index)
(_: _.order)
(_: if ((!isSwap _) && (_.size == null)) then 1 else 0)
];
mkType = type: mkType = type:
lib.strings.escapeShellArg ( lib.strings.escapeShellArg (
@ -220,12 +215,6 @@
description = "The index of the partition."; description = "The index of the partition.";
}; };
order = mkOption {
type = types.int;
description = "The sort order of the partition creation.";
default = 0;
};
label = mkOption { label = mkOption {
type = types.str; type = types.str;
description = "The label of the partition."; description = "The label of the partition.";