From c26b81b95c3a03d3ab961d53e23c5ada3f52a7e7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 15 Dec 2020 12:50:01 -0500 Subject: [PATCH 1/3] Lock down prelude to a version that works Got hash from https://dhall-lang.org/, for what it's worth. --- deps/Prelude.dhall | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deps/Prelude.dhall b/deps/Prelude.dhall index b2f63a7..a5df78a 100644 --- a/deps/Prelude.dhall +++ b/deps/Prelude.dhall @@ -1,2 +1 @@ -https://prelude.dhall-lang.org/package.dhall - +https://prelude.dhall-lang.org/v19.0.0/package.dhall sha256:eb693342eb769f782174157eba9b5924cf8ac6793897fc36a31ccbd6f56dafe2 -- GitLab From f466e7153e3e93b738b03008dfaa3ebfa4f182eb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 16 Dec 2020 17:12:58 -0500 Subject: [PATCH 2/3] Switch cabal-install ARM bindists to unbreak build The old ones went down. Hopefully somebody will approve these going on downloads.haskell.org someday instead. --- images/debian.dhall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/debian.dhall b/images/debian.dhall index c26d9c9..eacd0f7 100644 --- a/images/debian.dhall +++ b/images/debian.dhall @@ -187,7 +187,7 @@ let images: List Image.Type = , bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1" , triple = "aarch64-linux-gnu" }) , bootstrapGhc = { version = "8.10.2", triple = "aarch64-deb10-linux" } , llvm = Some (Llvm.Source.FromBindist { version = "10.0.1" , triple = "aarch64-linux-gnu" }) - , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/ghc/cabal-install-3.2.0.0-aarch64-debian9-linux.tar.xz" + , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/cabal-install-3.4.0.0-aarch64-ubuntu-20.04-bootstrapped.tar.xz" , extraPackages = [ "libnuma-dev" ] : List Text , withStack = False } @@ -199,7 +199,7 @@ let images: List Image.Type = , bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "armv7a-linux-gnueabihf" }) , bootstrapGhc = { version = "8.10.2", triple = "armv7-deb10-linux" } , llvm = Some (Llvm.Source.FromBindist { version = "10.0.1" , triple = "armv7a-linux-gnueabihf" }) - , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/ghc/cabal-install-3.2.0.0-armv7l-debian10-linux.tar.xz" + , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/cabal-install-3.4.0.0-armv7-ubuntu-20.04-bootstrapped.tar.xz" , extraPackages = [ "libnuma-dev" ] # debianBuildDepends , withStack = False } -- GitLab From 8206eae52a3347c9137222cda2f59b0ffcae691d Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sat, 19 Dec 2020 10:08:54 -0500 Subject: [PATCH 3/3] Bump cabal-install binaries --- images/debian.dhall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/debian.dhall b/images/debian.dhall index eacd0f7..3e5b171 100644 --- a/images/debian.dhall +++ b/images/debian.dhall @@ -187,7 +187,7 @@ let images: List Image.Type = , bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1" , triple = "aarch64-linux-gnu" }) , bootstrapGhc = { version = "8.10.2", triple = "aarch64-deb10-linux" } , llvm = Some (Llvm.Source.FromBindist { version = "10.0.1" , triple = "aarch64-linux-gnu" }) - , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/cabal-install-3.4.0.0-aarch64-ubuntu-20.04-bootstrapped.tar.xz" + , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/ghc/cabal-install-3.4.0.0-rc4-aarch64-linux.tar.xz" , extraPackages = [ "libnuma-dev" ] : List Text , withStack = False } @@ -199,7 +199,7 @@ let images: List Image.Type = , bootstrapLlvm = Some (Llvm.Source.FromBindist { version = "9.0.1", triple = "armv7a-linux-gnueabihf" }) , bootstrapGhc = { version = "8.10.2", triple = "armv7-deb10-linux" } , llvm = Some (Llvm.Source.FromBindist { version = "10.0.1" , triple = "armv7a-linux-gnueabihf" }) - , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/cabal-install-3.4.0.0-armv7-ubuntu-20.04-bootstrapped.tar.xz" + , cabalSource = Cabal.Type.FromBindist "http://home.smart-cactus.org/~ben/ghc/cabal-install-3.4.0.0-rc4-armv7l-deb10.tar.xz" , extraPackages = [ "libnuma-dev" ] # debianBuildDepends , withStack = False } -- GitLab