Skip to content

Commit 794cca2

Browse files
authored
julia_110{,-bin}: 1.10.4 -> 1.10.8 (#361201)
2 parents e6b1a3b + 237c868 commit 794cca2

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

pkgs/development/compilers/julia/default.nix

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ callPackage }:
1+
{ callPackage, fetchpatch2 }:
22

33
let
44
juliaWithPackages = callPackage ../../julia-modules { };
@@ -29,12 +29,12 @@ in
2929
{ });
3030
julia_110-bin = wrapJulia (callPackage
3131
(import ./generic-bin.nix {
32-
version = "1.10.4";
32+
version = "1.10.8";
3333
sha256 = {
34-
x86_64-linux = "079f61757c3b5b40d2ade052b3cc4816f50f7ef6df668825772562b3746adff1";
35-
aarch64-linux = "ae4ae6ade84a103cdf30ce91c8d4035a0ef51c3e2e66f90a0c13abeb4e100fc4";
36-
x86_64-darwin = "259c18a5294dd41cc60117ecb9fc5a8b2f659807284903a65439fb9d3818c763";
37-
aarch64-darwin = "97b88d7f9b5724118769f3a3bd259f8f7ada48cdecf3d584cf68162dd873dd10";
34+
x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735";
35+
aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd";
36+
x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f";
37+
aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b";
3838
};
3939
})
4040
{ });
@@ -60,10 +60,18 @@ in
6060
{ });
6161
julia_110 = wrapJulia (callPackage
6262
(import ./generic.nix {
63-
version = "1.10.4";
64-
hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE=";
63+
version = "1.10.8";
64+
hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc=";
6565
patches = [
6666
./patches/1.10/0002-skip-failing-and-flaky-tests.patch
67+
# Revert https://github.com/JuliaLang/julia/pull/55354
68+
# [build] Some improvements to the LLVM build system
69+
# Related: https://github.com/JuliaLang/julia/issues/55617
70+
(fetchpatch2 {
71+
url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch";
72+
revert = true;
73+
hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y=";
74+
})
6775
];
6876
})
6977
{ });

0 commit comments

Comments
 (0)