auxolotl/labs
22
8
Fork 4
Code Issues 1 Pull requests 3 Actions Packages Projects Releases Wiki Activity

fix: add missing prefix for submodules, incorrect var name

Browse source
This commit is contained in:
Jake Hamilton 2024-06-22 09:09:56 -07:00
parent dc2ce818b8
commit 9316874396
Signed by: jakehamilton
GPG key ID: 9762169A1B35EA68
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/src/types/default.nix
View file

@ -820,6 +820,7 @@ lib: {
check = value: builtins.isAttrs value || builtins.isFunction value || lib.types.path.check value; check = value: builtins.isAttrs value || builtins.isFunction value || lib.types.path.check value;
merge = location: definitions: let merge = location: definitions: let
result = base.extend { result = base.extend {
prefix = location;
modules = modules =
[{config.__module__.args.dynamic.name = lib.lists.last location;}] [{config.__module__.args.dynamic.name = lib.lists.last location;}]
++ getModules definitions; ++ getModules definitions;

2
tidepool/src/lib/systems.nix
View file

@ -2103,7 +2103,7 @@ in {
then "x86" # not i386 then "x86" # not i386
else if resolved.isMips64 else if resolved.isMips64
then "mips64" # uboot *does* distinguish between mips32/mips64 then "mips64" # uboot *does* distinguish between mips32/mips64
else resolved.linuxArch; # other cases appear to agree with linuxArch else resolved.linux.arch # other cases appear to agree with linuxArch
qemu.arch = qemu.arch =
if resolved.isAarch32 if resolved.isAarch32