diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-27 12:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 12:01:20 +0000 |
| commit | 2692c2e4277b0b1b3b01299462f238efccba91e2 (patch) | |
| tree | 9c186fa1b83585cd1f7f82351b8c8d061bfd6395 /nixos/modules/system/boot/loader/grub | |
| parent | 4fc4793298c10b1d648a0f269bc44394d5171c9e (diff) | |
| parent | 2431a34ffe50eeb382ea4d7f8d3984e9029d6e04 (diff) | |
| download | nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.gz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.bz2 nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.lz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.xz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.zst nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system/boot/loader/grub')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c6ec9acd54c..e183bc3648c 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -75,7 +75,7 @@ let else "${convertedFont}"); }); - bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {} + bootDeviceCounters = foldr (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {} (concatMap (args: args.devices) cfg.mirroredBoots); convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {} |