Unverified Commit 0589a5fa authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

pkgsCross.ghcjs.ghc: fix rts/Types.h missing for GHC >= 9.12.3 (#502348)

parents 655ec1f2 267a4851
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -323,6 +323,19 @@
      # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810
      ++ [ ./ghc-9.6-or-later-docs-sphinx-9.patch ]

      # Fixes rts/Types.h missing from the install when targeting javascript
      # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line
      # https://gitlab.haskell.org/ghc/ghc/-/issues/27033. krank:ignore-line
      # TODO(@sternenseemann): patch likely included in 9.12.4
      ++ lib.optionals (lib.versionAtLeast version "9.12.3" && lib.versionOlder version "9.15") [
        (fetchpatch {
          name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
          hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
          includes = [ "rts/rts.cabal" ];
        })
      ]

      ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });

    stdenv = stdenvNoCC;
+3 −3
Original line number Diff line number Diff line
import ./common-hadrian.nix {
  version = "9.15.20251225";
  rev = "a3afae0c85fa57479378a5df5bbde2e3a8da8a06";
  sha256 = "sha256-inZFFKnCb8C7RTlKP2bnHOLfc1GveGi6Wy0uAaLv1Kk=";
  version = "9.15.20260322";
  rev = "44f118f09dcde49f64d03e427312df4732f2d4a4";
  sha256 = "sha256-xby7HKyK5P1Y5DjKbVe62piDCY4Ujb4pbv8AJ7sQ0HI=";
}