diff --git a/lib/compile-boot.dhall b/lib/compile-boot.dhall index cfe69a1..c92833f 100644 --- a/lib/compile-boot.dhall +++ b/lib/compile-boot.dhall @@ -1,5 +1,6 @@ - -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Prelude = Sigil.Prelude @@ -8,10 +9,10 @@ let BootModules = Sigil.BootModules let RomEntry = Prelude.Map.Entry Text BootModules.ROM.Type let compile = - λ(addressType : Text) - → λ(boot : Sigil.Boot.Type) - → λ(out : Text) - → let NaturalIndex = { index : Natural, value : Text } + λ(addressType : Text) → + λ(boot : Sigil.Boot.Type) → + λ(out : Text) → + let NaturalIndex = { index : Natural, value : Text } let TextIndex = { index : Text, value : Text } @@ -20,8 +21,8 @@ let compile = let moduleValues = let f = - λ(e : RomEntry) - → merge + λ(e : RomEntry) → + merge { RomText = λ(text : Text) → ".ascii ${Text/show text}" , RomPath = λ(path : Text) → ".incbin ${Text/show path}" } @@ -31,16 +32,16 @@ let compile = # [ ".incbin \"${out}/config\"" ] let map = - λ(list : List Text) - → λ(f : TextIndex → Text) - → let indexedNatural = Prelude.List.indexed Text list + λ(list : List Text) → + λ(f : TextIndex → Text) → + let indexedNatural = Prelude.List.indexed Text list let indexed = Prelude.List.map NaturalIndex TextIndex - ( λ(x : NaturalIndex) - → { index = Prelude.Natural.show x.index + ( λ(x : NaturalIndex) → + { index = Prelude.Natural.show x.index , value = x.value } ) @@ -67,8 +68,8 @@ let compile = '' ++ mapNames - ( λ(m : TextIndex) - → '' + ( λ(m : TextIndex) → + '' ${addressType} _boot_module_${m.index}_name ${addressType} _boot_module_${m.index}_begin ${addressType} _boot_module_${m.index}_end - _boot_module_${m.index}_begin @@ -80,8 +81,8 @@ let compile = '' ++ mapNames - ( λ(m : TextIndex) - → '' + ( λ(m : TextIndex) → + '' .p2align DATA_ACCESS_ALIGNM_LOG2 _boot_module_${m.index}_name: .string "${m.value}" @@ -97,8 +98,8 @@ let compile = '' ++ mapValues - ( λ(m : TextIndex) - → '' + ( λ(m : TextIndex) → + '' .p2align MIN_PAGE_SIZE_LOG2 _boot_module_${m.index}_begin: ${m.value} diff --git a/lib/linux-script.dhall b/lib/linux-script.dhall index 569a4d2..200acf5 100644 --- a/lib/linux-script.dhall +++ b/lib/linux-script.dhall @@ -1,5 +1,6 @@ - -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Prelude = Sigil.Prelude @@ -8,27 +9,27 @@ let Args = { config : Sigil.Init.Type, rom : Sigil.BootModules.Type } : Type let RomEntry = Prelude.Map.Entry Text Sigil.BootModules.ROM.Type let addLine = - λ(e : RomEntry) - → λ(script : Text) - → merge + λ(e : RomEntry) → + λ(script : Text) → + merge { RomText = - λ(rom : Text) - → '' + λ(rom : Text) → + '' ${script} echo ${Text/show rom} > ${Text/show e.mapKey} '' , RomPath = - λ(rom : Text) - → '' + λ(rom : Text) → + '' ${script} ln -s ${Text/show rom} ${Text/show e.mapKey} '' } e.mapValue -in λ(args : Args) - → λ(out : Text) - → { config = Sigil.Init.render args.config +in λ(args : Args) → + λ(out : Text) → + { config = Sigil.Init.render args.config , script = Prelude.List.fold RomEntry diff --git a/nixos-modules/eris/cached_fs_rom.dhall b/nixos-modules/eris/cached_fs_rom.dhall index 11aede0..19c5bf2 100644 --- a/nixos-modules/eris/cached_fs_rom.dhall +++ b/nixos-modules/eris/cached_fs_rom.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Init = Sigil.Init diff --git a/nixos-modules/eris/rom-vfs.dhall b/nixos-modules/eris/rom-vfs.dhall index 0b547e0..283f26d 100644 --- a/nixos-modules/eris/rom-vfs.dhall +++ b/nixos-modules/eris/rom-vfs.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Init = Sigil.Init diff --git a/nixos-modules/gui/consoleLog.dhall b/nixos-modules/gui/consoleLog.dhall index 96162b5..1bd1033 100644 --- a/nixos-modules/gui/consoleLog.dhall +++ b/nixos-modules/gui/consoleLog.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Prelude = Sigil.Prelude diff --git a/nixos-modules/hardware/acpi_drv.dhall b/nixos-modules/hardware/acpi_drv.dhall index 475d989..79116a1 100644 --- a/nixos-modules/hardware/acpi_drv.dhall +++ b/nixos-modules/hardware/acpi_drv.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Init = Sigil.Init diff --git a/nixos-modules/services/tor.dhall b/nixos-modules/services/tor.dhall index ce97ac7..be50226 100644 --- a/nixos-modules/services/tor.dhall +++ b/nixos-modules/services/tor.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Init = Sigil.Init diff --git a/nixos-modules/store-wrapper.dhall b/nixos-modules/store-wrapper.dhall index 6a3b592..70345b9 100644 --- a/nixos-modules/store-wrapper.dhall +++ b/nixos-modules/store-wrapper.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Prelude = Sigil.Prelude diff --git a/tests/bash.dhall b/tests/bash.dhall index 153aa58..156af1e 100644 --- a/tests/bash.dhall +++ b/tests/bash.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Prelude = Sigil.Prelude diff --git a/tests/hello.dhall b/tests/hello.dhall index 4d0714b..66a9287 100644 --- a/tests/hello.dhall +++ b/tests/hello.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Init = Sigil.Init diff --git a/tests/posix.dhall b/tests/posix.dhall index 049065e..41975ec 100644 --- a/tests/posix.dhall +++ b/tests/posix.dhall @@ -1,4 +1,6 @@ -let Test = ./test.dhall ? env:DHALL_SIGIL_TEST +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Prelude = Sigil.Prelude diff --git a/tests/test.dhall b/tests/test.dhall index ea8dea3..89c8422 100644 --- a/tests/test.dhall +++ b/tests/test.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Prelude = Sigil.Prelude diff --git a/tests/vmm_arm.dhall b/tests/vmm_arm.dhall index 00f5bce..1e74578 100644 --- a/tests/vmm_arm.dhall +++ b/tests/vmm_arm.dhall @@ -1,4 +1,6 @@ -let Test = ./test.dhall ? env:DHALL_SIGIL_TEST +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let XML = Sigil.Prelude.XML diff --git a/tests/vmm_x86.dhall b/tests/vmm_x86.dhall index 595fc37..8ec67ff 100644 --- a/tests/vmm_x86.dhall +++ b/tests/vmm_x86.dhall @@ -1,4 +1,6 @@ -let Sigil = env:DHALL_SIGIL +let Sigil = + env:DHALL_SIGIL + ? https://git.sr.ht/~ehmry/dhall-sigil/blob/trunk/package.dhall let Init = Sigil.Init