summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2021-10-29 19:48:41 +0200
committersternenseemann <sternenseemann@systemli.org>2021-10-29 21:32:52 +0200
commit1d4787f14d264da8d18bc247facaf89d3511a56e (patch)
treeb29dd73b9e09acd4cefb745dbccfcf358cdcf9a9 /pkgs/development/compilers
parent2c83416cdc9ec22b189f43c29f8fd9f738ae8505 (diff)
downloadnixpkgs-1d4787f14d264da8d18bc247facaf89d3511a56e.tar
nixpkgs-1d4787f14d264da8d18bc247facaf89d3511a56e.tar.gz
nixpkgs-1d4787f14d264da8d18bc247facaf89d3511a56e.tar.bz2
nixpkgs-1d4787f14d264da8d18bc247facaf89d3511a56e.tar.lz
nixpkgs-1d4787f14d264da8d18bc247facaf89d3511a56e.tar.xz
nixpkgs-1d4787f14d264da8d18bc247facaf89d3511a56e.tar.zst
nixpkgs-1d4787f14d264da8d18bc247facaf89d3511a56e.zip
haskell.compiler.ghc921: 9.2.0.20210821 -> 9.2.1
https://mail.haskell.org/pipermail/glasgow-haskell-users/2021-October/027082.html

Also fixes a bug affecting the behavior of streaming-commons and text:
https://gitlab.haskell.org/ghc/ghc/-/issues/20526

Co-authored-by: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/ghc/9.2.1.nix18
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix
index 703ba0a705c..90dea665e6d 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
   ];