Unverified Commit 9ddc3313 authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

haskellPackages: update hackage and stackage (#346720)

parents f2d7c520 4279643c

doc/languages-frameworks/haskell.section.md

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ that depend on that library, you may want to use: 


```nix

haskellPackages.haskell-ci.overrideScope (self: super: {

  Cabal = self.Cabal_3_6_2_0;

  Cabal = self.Cabal_3_14_0_0;

})

```

pkgs/data/misc/hackage/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "commit": "5d97d9c05e76d8cecb68f1e9063afb39ca0fb26b",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5d97d9c05e76d8cecb68f1e9063afb39ca0fb26b.tar.gz",

  "sha256": "1ic4wn5immv06m1m2cq6mzrrgrxbidxmj39licxlkmnm9jlwzjwr",

  "msg": "Update from Hackage at 2024-09-03T10:29:19Z"

  "commit": "750067bc36e810a96c066c8800438e0ce9ced327",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz",

  "sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny",

  "msg": "Update from Hackage at 2024-10-05T14:46:54Z"

}

pkgs/development/compilers/ghc/8.10.7.nix

+14 −0
Original line number Diff line number Diff line
@@ -298,6 +298,20 @@ stdenv.mkDerivation (rec { 
      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch";

      hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s=";

    })



    # Backport part of <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7111> to 8.10.7

    # The change we are interested in is that Cabal no longer sets include-dirs

    # for the GHCi library delegating to the system search path or (in our case)

    # cc-wrapper. Without this patch, the target libffi ends up in there (which

    # we provide via --with-ffi-includes) which breaks bootstrapping e.g. when

    # cross compiling GHC. Without include-dirs, cc-wrapper and splicing will

    # correctly pick the suitable libffi out of the build environment.

    (fetchpatch {

      name = "ghci-no-libffi-include.patch";

      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/b2721819f391ab49871271283f32df54810c4387.patch";

      sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9";

      includes = [ "libraries/ghci/ghci.cabal.in" ];

    })

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    # Make Block.h compile with c++ compilers. Remove with the next release

    (fetchpatch {

pkgs/development/compilers/ghc/9.8.3.nix

0 → 100644
+4 −0
Original line number Diff line number Diff line 
import ./common-hadrian.nix rec {

  version = "9.8.3";

  sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70";

}

pkgs/development/compilers/ghc/head.nix

+3 −9
Original line number Diff line number Diff line 
import ./common-hadrian.nix {

  version = "9.11.20240410";

  rev = "1b1a92bd25c3f7249cf922c5dbf4415d2de44a36";

  sha256 = "sha256-2HdhxhVrKn8c/ZOGYoYThqXpod2OPiGXgH+mAV69Ip0=";

  # The STM benchmark contains chanbench.hs and ChanBench.hs causing a hash

  # mismatch on case insensitive filesystems. See also

  # https://gitlab.haskell.org/ghc/packages/stm/-/issues/2

  postFetch = ''

    rm -rf "$out/libraries/stm/bench"

  '';

  version = "9.11.20240423";

  rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6";

  sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9";

}