Add Debian 11 images

images/debian.dhall

@@ -185,7 +185,47 @@ let
     , toDocker = toDocker
     }
 
-let images: List Image.Type =
+let debian11Images: List Image.Type =
+[ DebianImage.toDocker DebianImage::
+    { name = "x86_64-linux-deb11"
+    , fromImage = "amd64/debian:bullseye"
+    , runnerTags = [ "x86_64-linux" ]
+    , bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "x86_64-linux-gnu-ubuntu-16.04" })
+    , bootstrapGhc = { version = "8.10.7", triple = "x86_64-deb10-linux" }
+    , llvm = Some (Llvm.Source.FromBindist { version = "11.0.1" , triple = "x86_64-linux-gnu-ubuntu-16.04" })
+    , cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
+    , extraPackages =
+          ubuntuBuildDepends
+        -- For cross-compilation testing
+        # ["crossbuild-essential-arm64"]
+        # [ "libnuma-dev" ]
+    }
+
+, DebianImage.toDocker DebianImage::
+    { name = "armv7-linux-deb11"
+    , fromImage = "arm32v7/debian:bullseye"
+    , runnerTags = [ "armv7-linux" ]
+    , bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "armv7a-linux-gnueabihf" })
+    , bootstrapGhc = { version = "8.10.7", triple = "armv7-deb10-linux" }
+    , llvm = Some (Llvm.Source.FromBindist { version = "11.0.1" , triple = "armv7a-linux-gnueabihf" })
+    , cabalSource = (Cabal.Type.FromBindist "https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.2.0/cabal-install-3.6.2.0-armv7-linux-deb10.tar.xz")
+    , extraPackages = [ "libnuma-dev" ] # ubuntuBuildDepends
+    , withStack = False
+    }
+, DebianImage.toDocker DebianImage::
+    { name = "aarch64-linux-deb11"
+    , fromImage = "arm64v8/debian:bullseye"
+    , runnerTags = [ "aarch64-linux" ]
+    , bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1" , triple = "aarch64-linux-gnu" })
+    , bootstrapGhc = { version = "8.10.7", triple = "aarch64-deb10-linux" }
+    , llvm = Some (Llvm.Source.FromBindist { version = "11.0.1" , triple = "aarch64-linux-gnu" })
+    , cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "aarch64-linux-deb10" }
+    , extraPackages = [ "libnuma-dev" ] : List Text
+    , withStack = False
+    }
+]
+
+let debian10Images: List Image.Type =
 [ DebianImage.toDocker DebianImage::
     { name = "aarch64-linux-deb10"
     , fromImage = "arm64v8/debian:buster"
@@ -197,7 +237,6 @@ let images: List Image.Type =
     , extraPackages = [ "libnuma-dev" ] : List Text
     , withStack = False
     }
-
 , DebianImage.toDocker DebianImage::
     { name = "armv7-linux-deb10"
     , fromImage = "arm32v7/debian:buster"
@@ -209,20 +248,7 @@ let images: List Image.Type =
     , extraPackages = [ "libnuma-dev" ] # debianBuildDepends
     , withStack = False
     }
-
-, DebianImage.toDocker DebianImage::
-    { name = "i386-linux-deb9"
-    , fromImage = "i386/debian:stretch"
-    , runnerTags = [ "x86_64-linux" ]
-    , bootstrapLlvm = None Llvm.Source
-    , bootstrapGhc = { version = "8.10.7", triple = "i386-deb9-linux" }
-    , llvm = None Llvm.Source
-    , cabalSource = (Cabal.Type.FromBindist "https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.2.0/cabal-install-3.6.2.0-i386-linux-alpine.tar.xz")
-    , extraPackages = debianBuildDepends # [ "cabal-install" ] : List Text
-    , withStack = False
-    }
-
--- N.B. Need bindist for deb10 i386
+    -- N.B. Need GHC bindist for deb10 i386
 --, DebianImage.toDocker DebianImage::
 --    { name = "i386-linux-deb10"
 --    , fromImage = "i386/debian:buster"
@@ -237,7 +263,6 @@ let images: List Image.Type =
 --      # [ "cabal-install" ]
 --    , withStack = False
 --    }
-
 , DebianImage.toDocker DebianImage::
     { name = "x86_64-linux-deb10"
     , fromImage = "amd64/debian:buster"
@@ -252,8 +277,10 @@ let images: List Image.Type =
         # ["crossbuild-essential-arm64"]
         # [ "libnuma-dev" ]
     }
+]
 
-, DebianImage.toDocker DebianImage::
+let debian9Images: List Image.Type =
+[ DebianImage.toDocker DebianImage::
     { name = "x86_64-linux-deb9"
     , fromImage = "amd64/debian:stretch"
     , runnerTags = [ "x86_64-linux" ]
@@ -263,8 +290,21 @@ let images: List Image.Type =
     , cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
     , extraPackages = debianBuildDepends : List Text
     }
-
 , DebianImage.toDocker DebianImage::
+    { name = "i386-linux-deb9"
+    , fromImage = "i386/debian:stretch"
+    , runnerTags = [ "x86_64-linux" ]
+    , bootstrapLlvm = None Llvm.Source
+    , bootstrapGhc = { version = "8.10.7", triple = "i386-deb9-linux" }
+    , llvm = None Llvm.Source
+    , cabalSource = (Cabal.Type.FromBindist "https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.2.0/cabal-install-3.6.2.0-i386-linux-alpine.tar.xz")
+    , extraPackages = debianBuildDepends # [ "cabal-install" ] : List Text
+    , withStack = False
+    }
+]
+
+let ubuntuImages: List Image.Type =
+[ DebianImage.toDocker DebianImage::
     { name = "x86_64-linux-ubuntu20_04"
     , fromImage = "amd64/ubuntu:20.04"
     , runnerTags = [ "x86_64-linux" ]
@@ -274,8 +314,10 @@ let images: List Image.Type =
     , cabalSource = Cabal.fromUpstreamBindist { version = "3.6.2.0", triple = "x86_64-linux-alpine-static" }
     , extraPackages = ubuntuBuildDepends
     }
+]
 
-, Image::
+let linterImages: List Image.Type =
+[ Image::
   { name = "linters"
   , runnerTags = [ "x86_64-linux" ]
   , jobStage = "build-derived"
@@ -311,4 +353,7 @@ let images: List Image.Type =
   }
 ]
 
-in images
+let allImages: List Image.Type =
+  linterImages # debian11Images # debian10Images # debian9Images # ubuntuImages
+
+in allImages