More fixes for docker build

google · Feb 12, 2023 · a553dab · a553dab
1 parent 8e3e67a
commit a553dab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build.sh b/build.sh
@@ -41,6 +41,7 @@ run . ghcjs-pkg hide non-empty               # Conflicts with semialign
 run . ghcjs-pkg hide hgeometry-combinatorial # Conflicts with random-shuffle
 run . ghcjs-pkg hide Cabal                   # Conflicts between multiple versions
 run . ghcjs-pkg hide cabal-doctest           # Conflicts between multiple versions
+run . ghcjs-pkg hide some                    # Conflicts with dependent-sum
 
 # Check for duplicate modules.  Fail the build if so, since that's a
 # poor user experience.

diff --git a/codeworld-available-pkgs/codeworld-available-pkgs.cabal b/codeworld-available-pkgs/codeworld-available-pkgs.cabal
@@ -173,7 +173,8 @@ Library
     keycode,
     latex,
     leancheck,
-    lens,
+    -- hgeometry doesn't build with lens 5
+    lens < 5,
     lifted-async,
     lifted-base,
     linear,