Skip to content

Commit 0e457c6

Browse files
Fix evalSystem and evalPackages with GHC 9.10 (#2229)
* Fix evalSystem and evalPackages with GHC 9.10 * Add materialized files * Update overlays/bootstrap.nix Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix GHA config --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent bb292c2 commit 0e457c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2033
-158
lines changed

.github/workflows/pipeline.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,20 @@ jobs:
227227
- name: "Check that the haskell.nix roots do not require IFDs"
228228
run: nix build .#roots.x86_64-linux --accept-flake-config --option allow-import-from-derivation false
229229

230-
hydra-without-remote-builders:
230+
hydra-without-remote-builders-ghc8107:
231231
runs-on: [self-hosted, linux]
232232
steps:
233233
- uses: actions/checkout@v4
234-
- name: "Check that evaluation of hydra jobs works without using remote builders"
234+
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 8.10.7"
235235
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc8107-native --show-trace --builders ''
236236

237+
hydra-without-remote-builders-ghc9101:
238+
runs-on: [self-hosted, linux]
239+
steps:
240+
- uses: actions/checkout@v4
241+
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.10.1"
242+
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9101-native --show-trace --builders ''
243+
237244
hix-cabal:
238245
runs-on: [self-hosted, linux]
239246
steps:

compiler/ghc/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ stdenv.mkDerivation (rec {
656656
# We could add `configured-src` as an output of the ghc derivation, but
657657
# having it as its own derivation means it can be accessed quickly without
658658
# building GHC.
659-
raw-src = stdenv.mkDerivation {
659+
raw-src = evalPackages: evalPackages.stdenv.mkDerivation {
660660
name = name + "-raw-src";
661661
inherit
662662
version

lib/call-cabal-project-to-nix.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ let
295295

296296
fixedProject = replaceSourceRepos rawCabalProject;
297297

298-
ghcSrc = ghc.raw-src or ghc.buildGHC.raw-src;
298+
ghcSrc = (ghc.raw-src or ghc.buildGHC.raw-src) evalPackages;
299299

300300
platformString = p: with p.parsed; "${cpu.name}-${vendor.name}-${kernel.name}";
301301

materialized/ghc-boot-packages-nix/ghc9101-aarch64/base.nix

+34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9101-aarch64/deriveConstants.nix

+39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9101-aarch64/genprimopcode.nix

+40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-bignum.nix

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-boot.nix

+47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-heap.nix

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-internal.nix

+49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-platform.nix

+31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)