diff options
| author | Malte Brandy <malte.brandy@maralorn.de> | 2022-08-09 01:00:20 +0200 |
|---|---|---|
| committer | Malte Brandy <malte.brandy@maralorn.de> | 2022-08-09 01:00:20 +0200 |
| commit | 0d4bde23622571db463ce750fc9993f077d06771 (patch) | |
| tree | 91fba01886aa084faba180f17c5eb1f3035512aa | |
| parent | Merge pull request #185622 from tjni/fix-text-format (diff) | |
| download | nixpkgs-origin/haskell-updates-ghc-9.4.1.tar.gz | |
haskell.compilers.ghc941: 9.4.0.20220721 -> 9.4.1origin/haskell-updates-ghc-9.4.1
| -rw-r--r-- | pkgs/development/compilers/ghc/9.4.1.nix | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/development/compilers/ghc/9.4.1.nix b/pkgs/development/compilers/ghc/9.4.1.nix index e24f9fbb3767..2d2a0ed89a83 100644 --- a/pkgs/development/compilers/ghc/9.4.1.nix +++ b/pkgs/development/compilers/ghc/9.4.1.nix @@ -177,34 +177,18 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.4.0.20220721"; + version = "9.4.1"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/9.4.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "bca8c52f76d8747a66291181de2de7bdf9ff80093808fe39bf5cbff0f116c426"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM="; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; - patches = [ - # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; - sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - # fix race condition in make build system - (fetchpatch { - name = "ghc-hs-boot-copying-fix.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff"; - sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx"; - }) - ]; - postPatch = "patchShebangs ."; # GHC needs the locale configured during the Haddock phase. |