Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haskell/cabal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cd2c554813d34ab9a939c094bbd3037a717c9bea
Choose a base ref
..
head repository: haskell/cabal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d977b87f5bc3f38df3f20fcd9dc1dc5722c24c35
Choose a head ref
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -235,7 +235,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.7 9.4.4
BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.8 9.6.5 9.8.2

.PHONY: bootstrap-jsons
bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)
6 changes: 3 additions & 3 deletions bootstrap/cabal-bootstrap-gen.cabal
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ 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
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0
, Cabal ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.1.0
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0 || ^>=3.12.1.0
-- For the release process, we need the last *two* Cabal-syntax
-- versions here: one to make CI green when release Cabal-syntax is
-- not yet on Hackage and we are bumping versions. The second for
4 changes: 2 additions & 2 deletions bootstrap/generate_bootstrap_plans
Original file line number Diff line number Diff line change
@@ -19,5 +19,5 @@ run "8_10_7"
run "9_0_2"
run "9_2_8"
run "9_4_8"
run "9_6_4"
run "9_8_1"
run "9_6_5"
run "9_8_2"
Loading