diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 703ba0a705c2..90dea665e6d6 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -142,24 +142,14 @@ let in stdenv.mkDerivation (rec { - version = "9.2.0.20210821"; + version = "9.2.1"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/9.2.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1q2pppxv2avhykyxvyq72r5p97rkkiqp19b77yhp85ralbcp4ivw"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "f444012f97a136d9940f77cdff03fda48f9475e2ed0fec966c4d35c4df55f746"; }; - patches = [ - # picked from release branch, remove with the next release candidate, - # see https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726 - (fetchpatch { - name = "fix-darwin-link-failure.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/77456387025ca74299ecc70621cbdb62b1b6ffc9.patch"; - sha256 = "1g8smrn7hj8cbp9fhrylvmrb15s0xd8lhdgxqnx0asnd4az82gj8"; - }) - ]; - enableParallelBuilding = true; outputs = [ "out" "doc" ]; @@ -255,7 +245,7 @@ stdenv.mkDerivation (rec { ] ++ lib.optionals enableDocs [ sphinx ] ++ lib.optionals stdenv.isDarwin [ - # TODO(@sternenseemann): use XATTR env var after backport of + # TODO(@sternenseemann): backport addition of XATTR env var like # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 xattr ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 29c0716b093b..3de5f97fe853 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -239,12 +239,10 @@ self: super: { # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; - # Disable tests pending resolution of - # https://github.com/haskell/text/issues/380 or https://github.com/fpco/streaming-commons/issues/60 - streaming-commons = dontCheck (appendPatch super.streaming-commons (pkgs.fetchpatch { + streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch"; sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy"; - })); + }); # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage hlint = super.hlint_3_3_4.overrideScope (self: super: {