Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make nixpkgs GHC 9.6.x work #1921

Merged
merged 10 commits into from
Dec 11, 2023
Merged

Make nixpkgs GHC 9.6.x work #1921

merged 10 commits into from
Dec 11, 2023

Commits on Dec 4, 2023

  1. Configuration menu
    Copy the full SHA
    72c3203 View commit details
    Browse the repository at this point in the history
  2. Handle different top level directories for nixpkgs GHC

    Some newer GHC versions have the `package.conf.d` below a `lib` directory.
    avdv committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    9d4be3c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6fcc564 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ac05cc8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a2533f6 View commit details
    Browse the repository at this point in the history
  6. Remove haddock/rts-1.0.2 from expected output for test-haddock

    ... on Windows.
    
    The pkg conf file for rts has entries for `haddock-interface` and `haddock-html`
    but neither of those actually exist.
    avdv committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    bc8d408 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b65ebd8 View commit details
    Browse the repository at this point in the history
  8. Work around otool not set to nix store path in GHC settings

    In previous GHC versions from nixpkgs, the `otool` setting was referencing a tool in the nix store,
    but for GHC 9.6.2 it is just set to "otool" which means it must be in `$PATH`.
    
    The same applies to the `install_name_tool`.
    
    See NixOS/nixpkgs#267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211
    
    We work around by using the location of the `ar` command and assume the other tools (from the bintools
    package) are also available at the same place.
    avdv committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    745663e View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Skip profiling test on macos with GHC 9.6.2

    Trying to build this results in a bus error with ghc-iserv.
    avdv committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    ce050b0 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Configuration menu
    Copy the full SHA
    895a4a2 View commit details
    Browse the repository at this point in the history