diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2020-08-23 01:28:45 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2020-09-02 00:42:50 +0200 |
| commit | 20d491a317d9956ddca80913f07d04bd234ea432 (patch) | |
| tree | a48e09dd2688004debda35c36afa9196b2e39305 /nixos/modules/installer | |
| parent | bfd706923e4d0781f4aad65beca9d5d7d167de6b (diff) | |
| download | nixpkgs-20d491a317d9956ddca80913f07d04bd234ea432.tar nixpkgs-20d491a317d9956ddca80913f07d04bd234ea432.tar.gz nixpkgs-20d491a317d9956ddca80913f07d04bd234ea432.tar.bz2 nixpkgs-20d491a317d9956ddca80913f07d04bd234ea432.tar.lz nixpkgs-20d491a317d9956ddca80913f07d04bd234ea432.tar.xz nixpkgs-20d491a317d9956ddca80913f07d04bd234ea432.tar.zst nixpkgs-20d491a317d9956ddca80913f07d04bd234ea432.zip | |
treewide: completely remove types.loaOf
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nixos-option/nixos-option.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index 79c835dc390..87545e84203 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -27,7 +27,7 @@ }; fileSystems."/boot/firmware" = { - # This effectively "renames" the loaOf entry set in sd-image.nix + # This effectively "renames" the attrsOf entry set in sd-image.nix mountPoint = "/boot"; neededForBoot = true; }; diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixos/modules/installer/tools/nixos-option/nixos-option.cc index 1a7b07a74f8..f779d82edbd 100644 --- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/nixos/modules/installer/tools/nixos-option/nixos-option.cc @@ -224,7 +224,7 @@ bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType) bool isAggregateOptionType(Context & ctx, Value & v) { - return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf") || optionTypeIs(ctx, v, "loaOf"); + return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf"); } MakeError(OptionPathError, EvalError); |