diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2021-11-05 15:41:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 15:41:57 +0900 |
| commit | 4269070d9465d9add707bc4e0db4ea0909f4df5f (patch) | |
| tree | 445dcf32f212bff3cf4f7ef082a5d2318a6b7d8e /pkgs/development/compilers | |
| parent | 1403ce522da36e28811f0e4748bd457e149647a4 (diff) | |
| parent | 316dee019773144e26dcf333cfe67638bca28577 (diff) | |
Merge pull request #142641 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/9.2.1.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch | 14 |
2 files changed, 4 insertions, 28 deletions
diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 703ba0a705c26..90dea665e6d60 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/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch b/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch deleted file mode 100644 index 20e19d8bf863e..0000000000000 --- a/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Data/Vector/Storable/Mutable.hs b/Data/Vector/Storable/Mutable.hs -index 8b538bc..2b74fce 100644 ---- a/Data/Vector/Storable/Mutable.hs -+++ b/Data/Vector/Storable/Mutable.hs -@@ -197,7 +197,9 @@ storableSet (MVector n fp) x - 1 -> storableSetAsPrim n fp x (undefined :: Word8) - 2 -> storableSetAsPrim n fp x (undefined :: Word16) - 4 -> storableSetAsPrim n fp x (undefined :: Word32) -+#if !defined(ghcjs_HOST_OS) - 8 -> storableSetAsPrim n fp x (undefined :: Word64) -+#endif - _ -> unsafeWithForeignPtr fp $ \p -> do - poke p x - |