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

Support GHC-9.6 (rebased) #1127

Closed
wants to merge 16 commits into from
Closed

Support GHC-9.6 (rebased) #1127

wants to merge 16 commits into from

Commits on Sep 11, 2024

  1. Support GHC-9.6 wrt haskell#979

    hasufell authored and hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    ed0fd9b View commit details
    Browse the repository at this point in the history
  2. Fix macOS build

    hasufell authored and hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    924194f View commit details
    Browse the repository at this point in the history
  3. Attempt to fix darwin CI

    mpickering authored and hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    81f30c8 View commit details
    Browse the repository at this point in the history
  4. Install coreutils and friends after all

    hasufell authored and hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    91bcd84 View commit details
    Browse the repository at this point in the history
  5. Restore deletions from freezefile

    Original branch had freezes undone by
    154a866 (hereafter: fix-hashable-mess),
    erred on the side of going with its newer situation.
    Doubts regarding my choices:
    - The `hspec` major versions have increased since to 2.11.* (over 2.10.*
      referred to there)
      See below where I kept the old version
    - `os-string` had a "bad" version 2.0.2.1 that was bumped everywhere,
      except in ghc{928,948}.Win32 where it had been at 2.0.2 -- it is
      unclear if that should've been bumped as well.
      Erred on the side of keeping those cases where the original branch had
      added `os-string ==2.0.3` given that that is the "good" version
    - Some dependencies were only touched in some freezefiles by
      fix-hashable-mess, so I kept the cases where they weren't touched
      around:
      - `hspec`: ghc*.Win32, excluding ghc965.Win32
      - `tasty` and friends: ghc*.Win32, excluding ghc965.Win32
      - `setenv`: ghc*.Win32, excluding ghc965.Win32
      (I didn't know what the correct versions to use for ghc965.Win32 were,
      so I didn't try guessing)
    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    f5e87e7 View commit details
    Browse the repository at this point in the history
  6. Fix tested-with version

    Given the presence of cabal.ghc965.*, I assume that's the correct
    version to target
    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    b16722e View commit details
    Browse the repository at this point in the history
  7. Reformat ghcup.cabal

    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    48e6c87 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    fe0c20e View commit details
    Browse the repository at this point in the history
  9. Add hashable -arch-native to ghc-9.6.5

    Cf fix-hashable-mess, presumably this should be added here as well
    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    bf57a35 View commit details
    Browse the repository at this point in the history
  10. Regenerate unix freeze files

    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    95c8aab View commit details
    Browse the repository at this point in the history
  11. Reorg cabal.project.release like cabal.project

    This aids in diffing the two
    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    b7a4d34 View commit details
    Browse the repository at this point in the history
  12. Remove last traces of streamly

    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    d997c6c View commit details
    Browse the repository at this point in the history
  13. Make release ghcup tar depend on ghc version

    Based on the behaviour of the other cabal.*.project files, introduced in
    411ac8d. I'm presuming it was forgotten
    hseg committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e4c2457 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    3af2a82 View commit details
    Browse the repository at this point in the history
  2. Revert e4c2457: Condition release tar flag

    As explained by @hasufell
    > This is not correct. The release project file always wants to build
    > with -tar. The tar flag is only there to circumvent complicated errors
    > during development, which sometimes happens due to libarchive.
    
    Add a note citing the above to the file to prevent future mixups
    hseg committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    9b12173 View commit details
    Browse the repository at this point in the history
  3. Remove redundancies from cabal.project.release

    Given that we import most of the configuration from cabal.project,
    there's no reason to duplicate it in cabal.project.release
    hseg committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    86b0c90 View commit details
    Browse the repository at this point in the history