diff --git a/images/debian.dhall b/images/debian.dhall index bec61512287b3ec9d71f7a576e6087281cf93f3d..42690e108cbb269d311a83d2f6db9dff525e4af0 100644 --- a/images/debian.dhall +++ b/images/debian.dhall @@ -325,7 +325,6 @@ let debian11Images: List Image.Type = { name = "x86_64-linux-deb11" , fromImage = "amd64/debian:bullseye" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = installLlvmFromApt "15" , bootstrapGhc = { version = "9.6.4", triple = "x86_64-deb10-linux" } , llvm = installLlvmFromApt "15" , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" } @@ -340,7 +339,6 @@ let debian11Images: List Image.Type = { name = "x86_64-linux-deb11-emsdk-closure" , fromImage = "amd64/debian:bullseye" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = installLlvmFromApt "15" , bootstrapGhc = { version = "9.6.4", triple = "x86_64-deb10-linux" } , llvm = installLlvmFromApt "15" , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" } @@ -365,7 +363,6 @@ let debian11Images: List Image.Type = { name = "aarch64-linux-deb11" , fromImage = "arm64v8/debian:bullseye" , runnerTags = [ "aarch64-linux" ] - , bootstrapLlvm = installLlvmFromApt "15" , bootstrapGhc = { version = "9.6.4", triple = "aarch64-deb10-linux" } , llvm = installLlvmFromApt "15" , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "aarch64-linux-deb10" } @@ -379,7 +376,6 @@ let debian12Images: List Image.Type = { name = "x86_64-linux-deb12" , fromImage = "amd64/debian:bookworm" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = bootLlvmConfig { version = "15.0.6", triple = "x86_64-linux-gnu-ubuntu-18.04" } , bootstrapGhc = { version = "9.6.4", triple = "x86_64-deb10-linux" } , llvm = installLlvmFromAptBookworm "18" , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb11" } @@ -398,7 +394,6 @@ let debian12Images: List Image.Type = { name = "aarch64-linux-deb12" , fromImage = "arm64v8/debian:bookworm" , runnerTags = [ "aarch64-linux" ] - , bootstrapLlvm = installLlvmFromApt "15" , bootstrapGhc = { version = "9.6.4", triple = "aarch64-deb10-linux" } , llvm = installLlvmFromApt "15" , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "aarch64-linux-deb11" } @@ -412,7 +407,6 @@ let debian10Images: List Image.Type = { name = "aarch64-linux-deb10" , fromImage = "arm64v8/debian:buster" , runnerTags = [ "aarch64-linux" ] - , bootstrapLlvm = installLlvmFromApt "15" , bootstrapGhc = { version = "9.6.4", triple = "aarch64-deb10-linux" } , llvm = installLlvmFromApt "15" , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "aarch64-linux-deb10" } @@ -437,7 +431,6 @@ let debian10Images: List Image.Type = { name = "i386-linux-deb10" , fromImage = "i386/debian:buster" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = None Llvm.Config , bootstrapGhc = { version = "9.6.4", triple = "i386-deb9-linux" } , llvm = None Llvm.Config , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "i386-linux-deb9" } @@ -451,7 +444,6 @@ let debian10Images: List Image.Type = { name = "x86_64-linux-deb10" , fromImage = "amd64/debian:buster" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = installLlvmFromApt "15" , bootstrapGhc = { version = "9.6.4", triple = "x86_64-deb10-linux" } , llvm = installLlvmFromApt "15" , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" } @@ -558,7 +550,6 @@ let bootstrapImages: List Image.Type = { name = "x86_64-linux-deb10-ghc9_2" , fromImage = "amd64/debian:buster" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = bootLlvmConfig { version = "15.0.6", triple = "x86_64-linux-gnu-ubuntu-18.04" } , bootstrapGhc = { version = "9.2.8", triple = "x86_64-deb10-linux" } , llvm = llvmConfig { version = "15.0.6" , triple = "x86_64-linux-gnu-ubuntu-18.04" } , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" } @@ -572,7 +563,6 @@ let bootstrapImages: List Image.Type = { name = "x86_64-linux-deb10-ghc9_4" , fromImage = "amd64/debian:buster" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = bootLlvmConfig { version = "15.0.6", triple = "x86_64-linux-gnu-ubuntu-18.04" } , bootstrapGhc = { version = "9.4.8", triple = "x86_64-deb10-linux" } , llvm = llvmConfig { version = "15.0.6" , triple = "x86_64-linux-gnu-ubuntu-18.04" } , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" } @@ -586,7 +576,6 @@ let bootstrapImages: List Image.Type = { name = "x86_64-linux-deb10-ghc9_6" , fromImage = "amd64/debian:buster" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = bootLlvmConfig { version = "15.0.6", triple = "x86_64-linux-gnu-ubuntu-18.04" } , bootstrapGhc = { version = "9.6.4", triple = "x86_64-deb10-linux" } , llvm = llvmConfig { version = "15.0.6" , triple = "x86_64-linux-gnu-ubuntu-18.04" } , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" } @@ -600,7 +589,6 @@ let bootstrapImages: List Image.Type = { name = "x86_64-linux-deb10-ghc9_8" , fromImage = "amd64/debian:buster" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = bootLlvmConfig { version = "15.0.6", triple = "x86_64-linux-gnu-ubuntu-18.04" } , bootstrapGhc = { version = "9.8.1", triple = "x86_64-deb10-linux" } , llvm = llvmConfig { version = "15.0.6" , triple = "x86_64-linux-gnu-ubuntu-18.04" } , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" } @@ -615,7 +603,6 @@ let bootstrapImages: List Image.Type = { name = "x86_64-linux-deb10-ghc9_10" , fromImage = "amd64/debian:buster" , runnerTags = [ "x86_64-linux" ] - , bootstrapLlvm = bootLlvmConfig { version = "15.0.6", triple = "x86_64-linux-gnu-ubuntu-18.04" } , bootstrapGhc = { version = "9.10.1", triple = "x86_64-deb10-linux" } , llvm = llvmConfig { version = "15.0.6" , triple = "x86_64-linux-gnu-ubuntu-18.04" } , cabalSource = Cabal.fromUpstreamBindist { version = "3.10.2.0", triple = "x86_64-linux-deb10" }