pyrox.dev
julia_111-bin: init at 1.11.0
+27
-1
pkgs/development/compilers/julia/default.nix
+27
-1
pkgs/development/compilers/julia/default.nix
···
1
-
{ callPackage }:
1
+
{ callPackage, fetchpatch }:
2
2
3
3
let
4
4
juliaWithPackages = callPackage ../../julia-modules { };
···
39
39
};
40
40
})
41
41
{ });
42
+
julia_111-bin = wrapJulia (callPackage
43
+
(import ./generic-bin.nix {
44
+
version = "1.11.0";
45
+
sha256 = {
46
+
x86_64-linux = "bcf815553fda2ed7910524c8caa189c8e8191a40a799dd8b5fbed0d9dd6b882c";
47
+
aarch64-linux = "66b9195b4c6b85403834dca9ef4fcae75f15be906bb3bb2c48eccb780ab810a1";
48
+
x86_64-darwin = "e001d80b53cb9637402633f6cf50cbf2d83d4de03c4093783b8878265996e33d";
49
+
aarch64-darwin = "c25ae0c87a418555e40167e07524824659656cb60bac9d1e4a5d50d887abe560";
50
+
};
51
+
})
52
+
{ });
42
53
julia_19 = wrapJulia (callPackage
43
54
(import ./generic.nix {
44
55
version = "1.9.4";
···
54
65
hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE=";
55
66
patches = [
56
67
./patches/1.10/0002-skip-failing-and-flaky-tests.patch
68
+
];
69
+
})
70
+
{ });
71
+
julia_111 = wrapJulia (callPackage
72
+
(import ./generic.nix {
73
+
version = "1.11.0";
74
+
hash = "sha256-jXd4DNBEhOIfnDgFvmsb1WppvL5srt8kheiZIF2FyHQ=";
75
+
patches = [
76
+
./patches/1.11/0002-skip-failing-and-flaky-tests.patch
77
+
# [build] avoid libedit linkage and align libccalllazy* SONAMEs
78
+
# https://github.com/JuliaLang/julia/pull/55968
79
+
(fetchpatch {
80
+
url = "https://github.com/JuliaLang/julia/commit/77c5875b3cbe85e7fb0bb5a7e796809c901ede95.patch";
81
+
hash = "sha256-wDAB3VVI6JfOyyFbAktdAe2Im/HbAciq9yFI4HIpWvY=";
82
+
})
57
83
];
58
84
})
59
85
{ });
+16
pkgs/development/compilers/julia/generic-bin.nix
+16
pkgs/development/compilers/julia/generic-bin.nix
···
24
24
"REPL"
25
25
# Test flaky
26
26
"ccall"
27
+
] ++ lib.optionals (lib.versionAtLeast version "1.11") [
28
+
# Test flaky
29
+
# https://github.com/JuliaLang/julia/issues/54280
30
+
"loading"
31
+
"cmdlineargs"
27
32
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
28
33
# Test flaky on ofborg
29
34
"FileWatching"
···
81
86
runHook preInstall
82
87
cp -r . $out
83
88
runHook postInstall
89
+
'';
90
+
91
+
# Align libccalllazy* SONAMEs
92
+
# https://github.com/JuliaLang/julia/pull/55968
93
+
preFixup = lib.optionalString (version == "1.11.0" && stdenv.hostPlatform.isLinux) ''
94
+
patchelf "$out/lib/julia/libccalllazyfoo.so" \
95
+
--set-soname libccalllazyfoo.so \
96
+
--replace-needed ccalllazybar.so libccalllazybar.so
97
+
patchelf "$out/lib/julia/libccalllazybar.so" \
98
+
--set-soname libccalllazybar.so \
99
+
--replace-needed ccalllazyfoo.so libccalllazyfoo.so
84
100
'';
85
101
86
102
# Breaks backtraces, etc.
+25
pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch
+25
pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch
···
1
+
From 9da2f2596db9f4f1a61825d82d9b8c3f3b2e99aa Mon Sep 17 00:00:00 2001
2
+
From: Nick Cao <nickcao@nichi.co>
3
+
Date: Wed, 10 Jan 2024 20:58:20 -0500
4
+
Subject: [PATCH 2/2] skip failing and flaky tests
5
+
6
+
---
7
+
test/Makefile | 2 +-
8
+
1 file changed, 1 insertion(+), 1 deletion(-)
9
+
10
+
diff --git a/test/Makefile b/test/Makefile
11
+
index 88dbe5b2b4..a2a7a55e20 100644
12
+
--- a/test/Makefile
13
+
+++ b/test/Makefile
14
+
@@ -28,7 +28,7 @@ default:
15
+
16
+
$(TESTS):
17
+
@cd $(SRCDIR) && \
18
+
- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
19
+
+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs $@)
20
+
21
+
$(addprefix revise-, $(TESTS)): revise-% :
22
+
@cd $(SRCDIR) && \
23
+
--
24
+
2.43.0
25
+