Skip to content

Commit 6f12424

Browse files
domenkozardomenkozar
committed
ghc: 8.10.5-binary -> 8.10.7-binary
1 parent e96f5ae commit 6f12424

2 files changed

Lines changed: 22 additions & 21 deletions

File tree

pkgs/development/compilers/ghc/8.10.5-binary.nix renamed to pkgs/development/compilers/ghc/8.10.7-binary.nix

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
1717
let
1818
downloadsUrl = "https://downloads.haskell.org/ghc";
1919

20-
version = "8.10.5";
20+
# Copy sha256 from https://downloads.haskell.org/~ghc/8.10.7/SHA256SUMS
21+
version = "8.10.7";
2122

2223
# Information about available bindists that we use in the build.
2324
#
@@ -42,7 +43,7 @@ let
4243
i686-linux = {
4344
src = {
4445
url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
45-
sha256 = "17cwmhhyz952psmp4j3pkdj0yrfxah3l2dawg5s4hdr228n5pjqc";
46+
sha256 = "fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab";
4647
};
4748
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
4849
archSpecificLibraries = [
@@ -55,7 +56,7 @@ let
5556
x86_64-linux = {
5657
src = {
5758
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz";
58-
sha256 = "11v76wgljyszc6mgz6r16i6wkifgl15a26q7ablihp2cr8h3qqmw";
59+
sha256 = "a13719bca87a0d3ac0c7d4157a4e60887009a7f1a8dbe95c4759ec413e086d30";
5960
};
6061
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
6162
archSpecificLibraries = [
@@ -65,7 +66,7 @@ let
6566
armv7l-linux = {
6667
src = {
6768
url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz";
68-
sha256 = "0v5bvhb2z9j26yr0n9gc4xdq2lm37mr98g62p5z8pqahhhd0s5sn";
69+
sha256 = "3949c31bdf7d3b4afb765ea8246bca4ca9707c5d988d9961a244f0da100956a2";
6970
};
7071
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
7172
archSpecificLibraries = [
@@ -75,7 +76,7 @@ let
7576
aarch64-linux = {
7677
src = {
7778
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
78-
sha256 = "1p0dgyn1m2nd8ax1g25lchaz9z2nk9jvyzf63biarq7qlzc5q24s";
79+
sha256 = "fad2417f9b295233bf8ade79c0e6140896359e87be46cb61cd1d35863d9d0e55";
7980
};
8081
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
8182
archSpecificLibraries = [
@@ -86,7 +87,7 @@ let
8687
x86_64-darwin = {
8788
src = {
8889
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
89-
sha256 = "08javwfqd21kglbr1bnhnbjw2cggz1n668vi8kx5hbcnz3plf3zg";
90+
sha256 = "287db0f9c338c9f53123bfa8731b0996803ee50f6ee847fe388092e5e5132047";
9091
};
9192
exePathForLibraryCheck = null; # we don't have a library check for darwin yet
9293
archSpecificLibraries = [
@@ -97,7 +98,7 @@ let
9798
aarch64-darwin = {
9899
src = {
99100
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
100-
sha256 = "02fbcrzcc6m25z3ji867isml38jkg4blry70ljwl3l03zxq4ws03";
101+
sha256 = "dc469fc3c35fd2a33a5a575ffce87f13de7b98c2d349a41002e200a56d9bba1c";
101102
};
102103
exePathForLibraryCheck = null; # we don't have a library check for darwin yet
103104
archSpecificLibraries = [
@@ -111,7 +112,7 @@ let
111112
x86_64-linux = {
112113
src = {
113114
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz";
114-
sha256 = "1ql2qxywbbv0b9syvrm9kyh5d8midnl676lw4698ajras6gcvmzl";
115+
sha256 = "16903df850ef73d5246f2ff169cbf57ecab76c2ac5acfa9928934282cfad575c";
115116
};
116117
exePathForLibraryCheck = "bin/ghc";
117118
archSpecificLibraries = [

‎pkgs/top-level/haskell-packages.nix‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ let
66
"ghc865Binary"
77
"ghc8102Binary"
88
"ghc8102BinaryMinimal"
9-
"ghc8105Binary"
10-
"ghc8105BinaryMinimal"
9+
"ghc8107Binary"
10+
"ghc8107BinaryMinimal"
1111
"integer-simple"
1212
"native-bignum"
1313
"ghcHEAD"
@@ -59,19 +59,19 @@ in {
5959
minimal = true;
6060
};
6161

62-
ghc8105Binary = callPackage ../development/compilers/ghc/8.10.5-binary.nix {
62+
ghc8107Binary = callPackage ../development/compilers/ghc/8.10.7-binary.nix {
6363
llvmPackages = pkgs.llvmPackages_11;
6464
};
6565

66-
ghc8105BinaryMinimal = callPackage ../development/compilers/ghc/8.10.5-binary.nix {
66+
ghc8107BinaryMinimal = callPackage ../development/compilers/ghc/8.10.7-binary.nix {
6767
llvmPackages = pkgs.llvmPackages_11;
6868
minimal = true;
6969
};
7070

7171
ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
7272
# the oldest ghc with aarch64-darwin support is 8.10.5
7373
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
74-
packages.ghc8105BinaryMinimal
74+
packages.ghc8107BinaryMinimal
7575
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
7676
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
7777
else if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then
@@ -85,7 +85,7 @@ in {
8585
ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
8686
# the oldest ghc with aarch64-darwin support is 8.10.5
8787
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
88-
packages.ghc8105BinaryMinimal
88+
packages.ghc8107BinaryMinimal
8989
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
9090
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
9191
else if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then
@@ -103,7 +103,7 @@ in {
103103
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
104104
# the oldest ghc with aarch64-darwin support is 8.10.5
105105
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
106-
packages.ghc8105BinaryMinimal
106+
packages.ghc8107BinaryMinimal
107107
# aarch64 ghc8102Binary exceeds max output size on hydra
108108
else if stdenv.isAarch64 || stdenv.isAarch32 then
109109
packages.ghc8102BinaryMinimal
@@ -184,15 +184,15 @@ in {
184184
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
185185
packageSetConfig = bootstrapPackageSet;
186186
};
187-
ghc8105Binary = callPackage ../development/haskell-modules {
188-
buildHaskellPackages = bh.packages.ghc8105Binary;
189-
ghc = bh.compiler.ghc8105Binary;
187+
ghc8107Binary = callPackage ../development/haskell-modules {
188+
buildHaskellPackages = bh.packages.ghc8107Binary;
189+
ghc = bh.compiler.ghc8107Binary;
190190
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
191191
packageSetConfig = bootstrapPackageSet;
192192
};
193-
ghc8105BinaryMinimal = callPackage ../development/haskell-modules {
194-
buildHaskellPackages = bh.packages.ghc8105BinaryMinimal;
195-
ghc = bh.compiler.ghc8105BinaryMinimal;
193+
ghc8107BinaryMinimal = callPackage ../development/haskell-modules {
194+
buildHaskellPackages = bh.packages.ghc8107BinaryMinimal;
195+
ghc = bh.compiler.ghc8107BinaryMinimal;
196196
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
197197
packageSetConfig = bootstrapPackageSet;
198198
};

0 commit comments

Comments
 (0)