Skip to content

Commit f1fe208

Browse files
committed
Update bootstrap plans for hooks-exe
This commit updates the bootstrap plans to account for the new local hooks-exe package, which cabal-install depends on.
1 parent bbd8f4a commit f1fe208

11 files changed

+3745
-3663
lines changed

bootstrap/bootstrap.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ class PackageSource(Enum):
8484
local_packages: List[PackageName] = [ "Cabal-syntax"
8585
, "Cabal"
8686
, "Cabal-hooks"
87-
, "Cabal-QuickCheck"
88-
, "Cabal-described"
89-
, "Cabal-tests"
90-
, "Cabal-tree-diff"
9187
, "cabal-install-solver"
9288
, "cabal-install"
9389
, "hooks-exe"

bootstrap/generate_bootstrap_plans

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
nix build nixpkgs#jq.bin -o jq
22
PATH+=:$PWD/jq-bin/bin
33

4-
ghcs_nix="https://gitlab.haskell.org/bgamari/ghcs-nix/-/archive/master/ghcs-nix-master.tar.gz"
4+
ghcs_nix="https://gitlab.haskell.org/bgamari/ghcs-nix/-/archive/wip/9-10-2/ghcs-nix-master.tar.gz"
55

66
nix build -f "$ghcs_nix" ghc-9_6_5 -o boot_ghc
77

@@ -10,14 +10,17 @@ run() {
1010
local drv="ghc-$ver"
1111
echo "$ver"
1212
nix build -f "$ghcs_nix" $drv
13+
echo "hello"
1314
(cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.bootstrap.project --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
15+
echo "hello2"
1416
jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json"
17+
echo "hello3"
1518
cabal run --with-ghc-pkg $PWD/boot_ghc/bin/ghc-pkg -w $PWD/boot_ghc/bin/ghc -v0 cabal-bootstrap-gen -- "plan-$ver.json" | jq --sort-keys | tee "linux-$(echo $ver | tr "_" ".").json"
1619
}
1720

1821
run "9_2_8"
1922
run "9_4_8"
2023
run "9_6_7"
2124
run "9_8_4"
22-
run "9_10_1"
25+
run "9_10_2"
2326
run "9_12_2"

0 commit comments

Comments
 (0)