haskell.compiler: upgrade to 9.2.4 for 9.2.* binary compiler

+24 -33
+8 -20
pkgs/development/compilers/ghc/9.2.2-binary.nix pkgs/development/compilers/ghc/9.2.4-binary.nix
··· 19 19 let 20 20 downloadsUrl = "https://downloads.haskell.org/ghc"; 21 21 22 - # Copy sha256 from https://downloads.haskell.org/~ghc/9.2.2/SHA256SUMS 23 - version = "9.2.2"; 22 + # Copy sha256 from https://downloads.haskell.org/~ghc/9.2.4/SHA256SUMS 23 + version = "9.2.4"; 24 24 25 25 # Information about available bindists that we use in the build. 26 26 # ··· 46 46 variantSuffix = ""; 47 47 src = { 48 48 url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; 49 - sha256 = "24234486ed4508161c6f88f4750a36d38b135b0c6e5fe78efe2d85c612ecaf9e"; 49 + sha256 = "5dc1eb9c65f01b1e5c5693af72af07a4e9e75c6920e620fd598daeefa804487a"; 50 50 }; 51 51 exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; 52 52 archSpecificLibraries = [ ··· 61 61 variantSuffix = ""; 62 62 src = { 63 63 url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; 64 - sha256 = "fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc"; 65 - }; 66 - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; 67 - archSpecificLibraries = [ 68 - { nixPackage = gmp; fileToCheckFor = null; } 69 - { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } 70 - ]; 71 - }; 72 - armv7l-linux = { 73 - variantSuffix = ""; 74 - src = { 75 - url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; 76 - sha256 = "ce5a7c3beb19d8c13a9e60bd39d3ba8ef0060b954ea42eb23f1ef8d077fa9e8b"; 64 + sha256 = "a77a91a39d9b0167124b7e97648b2b52973ae0978cb259e0d44f0752a75037cb"; 77 65 }; 78 66 exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; 79 67 archSpecificLibraries = [ ··· 85 73 variantSuffix = ""; 86 74 src = { 87 75 url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; 88 - sha256 = "f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98"; 76 + sha256 = "fc7dbc6bae36ea5ac30b7e9a263b7e5be3b45b0eb3e893ad0bc2c950a61f14ec"; 89 77 }; 90 78 exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; 91 79 archSpecificLibraries = [ ··· 98 86 variantSuffix = ""; 99 87 src = { 100 88 url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; 101 - sha256 = "934abbd6083d3aeb5ff081955682d7711d9e79db57b1613eb229c325dd06f83f"; 89 + sha256 = "f2e8366fd3754dd9388510792aba2d2abecb1c2f7f1e5555f6065c3c5e2ffec4"; 102 90 }; 103 91 exePathForLibraryCheck = null; # we don't have a library check for darwin yet 104 92 archSpecificLibraries = [ ··· 111 99 variantSuffix = ""; 112 100 src = { 113 101 url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; 114 - sha256 = "d1f04f7cc062ed134f863305c67dfe2c42df46ed658dd34f9dd552186f194e5c"; 102 + sha256 = "8cf8408544a1a43adf1bbbb0dd6b074efadffc68bfa1a792947c52e825171224"; 115 103 }; 116 104 exePathForLibraryCheck = null; # we don't have a library check for darwin yet 117 105 archSpecificLibraries = [ ··· 127 115 variantSuffix = "-musl"; 128 116 src = { 129 117 url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz"; 130 - sha256 = "624523826e24eae33c03490267cddecc1d80c047f2a3f4b03580f1040112d5c0"; 118 + sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481"; 131 119 }; 132 120 isStatic = true; 133 121 # We can't check the RPATH for statically linked executable
+16 -13
pkgs/top-level/haskell-packages.nix
··· 8 8 "ghc8102BinaryMinimal" 9 9 "ghc8107Binary" 10 10 "ghc8107BinaryMinimal" 11 - "ghc922Binary" 12 - "ghc922BinaryMinimal" 11 + "ghc924Binary" 12 + "ghc924BinaryMinimal" 13 13 "ghcjs" 14 14 "ghcjs810" 15 15 "integer-simple" ··· 86 86 minimal = true; 87 87 }; 88 88 89 - ghc922Binary = callPackage ../development/compilers/ghc/9.2.2-binary.nix { 89 + ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { 90 90 llvmPackages = pkgs.llvmPackages_12; 91 91 }; 92 - ghc922BinaryMinimal = callPackage ../development/compilers/ghc/9.2.2-binary.nix { 92 + ghc924BinaryMinimal = callPackage ../development/compilers/ghc/9.2.4-binary.nix { 93 93 llvmPackages = pkgs.llvmPackages_12; 94 94 minimal = true; 95 95 }; ··· 192 192 ghc94 = ghc942; 193 193 ghcHEAD = callPackage ../development/compilers/ghc/head.nix { 194 194 bootPkgs = 195 - if stdenv.isAarch64 || stdenv.isAarch32 then 196 - packages.ghc922BinaryMinimal 195 + # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. 196 + if stdenv.hostPlatform.isAarch32 then 197 + packages.ghc924 197 198 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then 198 199 packages.ghc924 200 + else if stdenv.isAarch64 then 201 + packages.ghc924BinaryMinimal 199 202 else 200 - packages.ghc922Binary; 203 + packages.ghc924Binary; 201 204 inherit (buildPackages.python3Packages) sphinx; 202 205 # Need to use apple's patched xattr until 203 206 # https://github.com/xattr/xattr/issues/44 and ··· 272 275 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; 273 276 packageSetConfig = bootstrapPackageSet; 274 277 }; 275 - ghc922Binary = callPackage ../development/haskell-modules { 276 - buildHaskellPackages = bh.packages.ghc922Binary; 277 - ghc = bh.compiler.ghc922Binary; 278 + ghc924Binary = callPackage ../development/haskell-modules { 279 + buildHaskellPackages = bh.packages.ghc924Binary; 280 + ghc = bh.compiler.ghc924Binary; 278 281 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; 279 282 packageSetConfig = bootstrapPackageSet; 280 283 }; 281 - ghc922BinaryMinimal = callPackage ../development/haskell-modules { 282 - buildHaskellPackages = bh.packages.ghc922BinaryMinimal; 283 - ghc = bh.compiler.ghc922BinaryMinimal; 284 + ghc924BinaryMinimal = callPackage ../development/haskell-modules { 285 + buildHaskellPackages = bh.packages.ghc924BinaryMinimal; 286 + ghc = bh.compiler.ghc924BinaryMinimal; 284 287 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; 285 288 packageSetConfig = bootstrapPackageSet; 286 289 };