tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
julia: refresh patches, disable failing Zlib_jll version test
Nick Cao
3 years ago
6ee6ee22
39ee23f4
+13
-13
4 changed files
expand all
collapse all
unified
split
pkgs
development
compilers
julia
patches
1.8
0001-skip-symlink-system-libraries.patch
0002-skip-building-doc.patch
0003-skip-failing-tests.patch
0004-ignore-absolute-path-when-loading-library.patch
+3
-3
pkgs/development/compilers/julia/patches/1.8/0001-skip-symlink-system-libraries.patch
···
1
-
From f342b6bfab5eee9c7fea9ddc8804d9a5ff6953eb Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:42:08 +0800
4
Subject: [PATCH 1/4] skip symlink system libraries
···
8
1 file changed, 2 deletions(-)
9
10
diff --git a/base/Makefile b/base/Makefile
11
-
index 23a9c40..12f92aa 100644
12
--- a/base/Makefile
13
+++ b/base/Makefile
14
@@ -181,7 +181,6 @@ $$(build_private_libdir)/$$(libname_$2):
···
28
endif
29
30
--
31
-
2.37.2
32
···
1
+
From 1faa30525c9671ffd3a08901896b521a040d7e5c Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:42:08 +0800
4
Subject: [PATCH 1/4] skip symlink system libraries
···
8
1 file changed, 2 deletions(-)
9
10
diff --git a/base/Makefile b/base/Makefile
11
+
index 23a9c4011..12f92aa05 100644
12
--- a/base/Makefile
13
+++ b/base/Makefile
14
@@ -181,7 +181,6 @@ $$(build_private_libdir)/$$(libname_$2):
···
28
endif
29
30
--
31
+
2.38.1
32
+3
-3
pkgs/development/compilers/julia/patches/1.8/0002-skip-building-doc.patch
···
1
-
From 6a7723be33261cdc302e0f7bdb37fb50d30cc5fc Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:42:31 +0800
4
Subject: [PATCH 2/4] skip building doc
···
8
1 file changed, 1 insertion(+), 1 deletion(-)
9
10
diff --git a/Makefile b/Makefile
11
-
index d38311d..a775d36 100644
12
--- a/Makefile
13
+++ b/Makefile
14
@@ -227,7 +227,7 @@ define stringreplace
···
21
@$(MAKE) $(QUIET_MAKE) all
22
else
23
--
24
-
2.37.2
25
···
1
+
From 05c008dcabaf94f5623f2f7e267005eef0a8c5fc Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:42:31 +0800
4
Subject: [PATCH 2/4] skip building doc
···
8
1 file changed, 1 insertion(+), 1 deletion(-)
9
10
diff --git a/Makefile b/Makefile
11
+
index d38311dce..a775d36e1 100644
12
--- a/Makefile
13
+++ b/Makefile
14
@@ -227,7 +227,7 @@ define stringreplace
···
21
@$(MAKE) $(QUIET_MAKE) all
22
else
23
--
24
+
2.38.1
25
+4
-4
pkgs/development/compilers/julia/patches/1.8/0003-skip-failing-tests.patch
···
1
-
From a57c582eabc4703ed627b32f7f11893db9676fb6 Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:42:59 +0800
4
Subject: [PATCH 3/4] skip failing tests
···
8
1 file changed, 1 insertion(+), 1 deletion(-)
9
10
diff --git a/test/Makefile b/test/Makefile
11
-
index 24e137a..0e82acf 100644
12
--- a/test/Makefile
13
+++ b/test/Makefile
14
@@ -23,7 +23,7 @@ default:
···
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 LibGit2_jll --skip MozillaCACerts_jll --skip NetworkOptions --skip nghttp2_jll $@)
20
21
$(addprefix revise-, $(TESTS)): revise-% :
22
@cd $(SRCDIR) && \
23
--
24
-
2.37.2
25
···
1
+
From 756d4e977f8f224e20effa82c612e5a9cc14d82e Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:42:59 +0800
4
Subject: [PATCH 3/4] skip failing tests
···
8
1 file changed, 1 insertion(+), 1 deletion(-)
9
10
diff --git a/test/Makefile b/test/Makefile
11
+
index 24e137a5b..c17ccea8a 100644
12
--- a/test/Makefile
13
+++ b/test/Makefile
14
@@ -23,7 +23,7 @@ default:
···
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 LibGit2_jll --skip MozillaCACerts_jll --skip NetworkOptions --skip nghttp2_jll --skip Zlib_jll $@)
20
21
$(addprefix revise-, $(TESTS)): revise-% :
22
@cd $(SRCDIR) && \
23
--
24
+
2.38.1
25
+3
-3
pkgs/development/compilers/julia/patches/1.8/0004-ignore-absolute-path-when-loading-library.patch
···
1
-
From a60100f06f48fbb4697aced65175bf3d41185e3e Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:43:15 +0800
4
Subject: [PATCH 4/4] ignore absolute path when loading library
···
8
1 file changed, 1 insertion(+), 3 deletions(-)
9
10
diff --git a/cli/loader_lib.c b/cli/loader_lib.c
11
-
index 0301b6e..5cbda61 100644
12
--- a/cli/loader_lib.c
13
+++ b/cli/loader_lib.c
14
@@ -50,9 +50,7 @@ static void * load_library(const char * rel_path, const char * src_dir, int err)
···
23
#if defined(_OS_WINDOWS_)
24
wchar_t wpath[2*JL_PATH_MAX + 1] = {0};
25
--
26
-
2.37.2
27
···
1
+
From c0e587f4c50bd7bedfe6e5102e9b47c9704fac9b Mon Sep 17 00:00:00 2001
2
From: Nick Cao <nickcao@nichi.co>
3
Date: Tue, 20 Sep 2022 18:43:15 +0800
4
Subject: [PATCH 4/4] ignore absolute path when loading library
···
8
1 file changed, 1 insertion(+), 3 deletions(-)
9
10
diff --git a/cli/loader_lib.c b/cli/loader_lib.c
11
+
index 0301b6eed..5cbda61af 100644
12
--- a/cli/loader_lib.c
13
+++ b/cli/loader_lib.c
14
@@ -50,9 +50,7 @@ static void * load_library(const char * rel_path, const char * src_dir, int err)
···
23
#if defined(_OS_WINDOWS_)
24
wchar_t wpath[2*JL_PATH_MAX + 1] = {0};
25
--
26
+
2.38.1
27