Skip to content

Commit abe6585

Browse files
committed
fix handling of index-state
1 parent 7395b8e commit abe6585

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,9 +962,14 @@ _build/bindist/tests.tar.gz:
962962

963963
$(GHC1) $(GHC2): | hackage
964964
hackage: _build/packages/hackage.haskell.org/01-index.tar.gz
965+
966+
# Always run cabal update. This makes sure that the index file won't go stale,
967+
# whatever index-state we set in the project file. Reproducibility is left to
968+
# index-state.
969+
.PHONY: _build/packages/hackage.haskell.org/01-index.tar.gz
965970
_build/packages/hackage.haskell.org/01-index.tar.gz: | $(CABAL)
966971
@mkdir -p $(@D)
967-
$(CABAL) $(CABAL_ARGS) update --index-state @1745256340
972+
$(CABAL) $(CABAL_ARGS) update
968973

969974
# booted depends on successful source preparation
970975
configure rts/configure libraries/ghc-internal/configure driver/ghci/ghci-wrapper.cabal libraries/base/base.cabal libraries/ghc-experimental/ghc-experimental.cabal libraries/ghc-boot-th-next/ghc-boot-th-next.cabal libraries/ghci/ghci.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghc-boot/ghc-boot.cabal libraries/template-haskell/template-haskell.cabal libraries/ghc-heap/ghc-heap.cabal libraries/ghc-internal/ghc-internal.cabal compiler/ghc.cabal utils/ghc-pkg/ghc-pkg.cabal utils/runghc/runghc.cabal utils/ghc-iserv/ghc-iserv.cabal utils/remote-iserv/remote-iserv.cabal ghc/ghc-bin.cabal: configure.ac rts/configure.ac libraries/ghc-internal/configure.ac libraries/ghc-boot-th-next/.synth-stamp driver/ghci/ghci-wrapper.cabal.in libraries/base/base.cabal.in libraries/ghc-experimental/ghc-experimental.cabal.in libraries/ghc-boot-th-next/ghc-boot-th-next.cabal.in libraries/ghci/ghci.cabal.in libraries/ghc-boot-th/ghc-boot-th.cabal.in libraries/ghc-boot/ghc-boot.cabal.in libraries/template-haskell/template-haskell.cabal.in libraries/ghc-heap/ghc-heap.cabal.in libraries/ghc-internal/ghc-internal.cabal.in compiler/ghc.cabal.in utils/ghc-pkg/ghc-pkg.cabal.in utils/runghc/runghc.cabal.in utils/ghc-iserv/ghc-iserv.cabal.in utils/remote-iserv/remote-iserv.cabal.in ghc/ghc-bin.cabal.in

cabal.project.stage1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
index-state: 2025-10-26T19:17:08Z
2+
13
packages:
24
-- NOTE: we need rts-headers, because the _newly_ built compiler depends
35
-- on these potentially _new_ headers, we must not rely on those from
@@ -37,6 +39,7 @@ packages:
3739
utils/ghc-toolchain
3840
utils/ghc-toolchain/exe
3941

42+
4043
benchmarks: False
4144
tests: False
4245
allow-boot-library-installs: True

0 commit comments

Comments
 (0)