Tentative bootstrap fix

ffaf1 · Mar 8, 2024 · e7c0186 · e7c0186
1 parent 1601939
commit e7c0186
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 562 deletions.
diff --git a/Makefile b/Makefile
@@ -205,7 +205,7 @@ bootstrap-json-%: phony
 	cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
 		| python3 -m json.tool > linux-$*.json
 
-BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.8 9.6.4 9.8.2
+BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.8 9.6.4
 
 bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)
 

diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal
@@ -9,7 +9,7 @@ executable cabal-bootstrap-gen
   main-is:          Main.hs
   build-depends:
     , aeson                  ^>=1.5.2.0  || ^>=2.0.3.0 || ^>=2.1.0.0
-    , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0
+    , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0 || ^>=4.18.0.0
     , bytestring             ^>=0.10.8.2 || ^>=0.11.0.0
     , Cabal                  ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.0.0
     , Cabal-syntax           ^>=3.10.0.1

diff --git a/bootstrap/cabal.project b/bootstrap/cabal.project
@@ -3,3 +3,4 @@
 
 packages: .
 optimization: False
+allow-newer: True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@

		packages: .
		optimization: False
		allow-newer: True