Skip to content

Commit

Permalink
Fix evalSystem and evalPackages with GHC 9.10 (#2229)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
hamishmack and github-actions[bot] authored Jul 15, 2024
1 parent bb292c2 commit 0e457c6
Show file tree
Hide file tree
Showing 53 changed files with 2,033 additions and 158 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,20 @@ jobs:
- name: "Check that the haskell.nix roots do not require IFDs"
run: nix build .#roots.x86_64-linux --accept-flake-config --option allow-import-from-derivation false

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

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

hix-cabal:
runs-on: [self-hosted, linux]
steps:
Expand Down
2 changes: 1 addition & 1 deletion compiler/ghc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ stdenv.mkDerivation (rec {
# We could add `configured-src` as an output of the ghc derivation, but
# having it as its own derivation means it can be accessed quickly without
# building GHC.
raw-src = stdenv.mkDerivation {
raw-src = evalPackages: evalPackages.stdenv.mkDerivation {
name = name + "-raw-src";
inherit
version
Expand Down
2 changes: 1 addition & 1 deletion lib/call-cabal-project-to-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ let

fixedProject = replaceSourceRepos rawCabalProject;

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

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

Expand Down
34 changes: 34 additions & 0 deletions materialized/ghc-boot-packages-nix/ghc9101-aarch64/base.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-bignum.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-boot.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions materialized/ghc-boot-packages-nix/ghc9101-aarch64/ghc-heap.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0e457c6

Please sign in to comment.