nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

julia: refresh patches, disable failing Zlib_jll version test

Browse Source
This commit is contained in:
Nick Cao 2022-11-08 13:31:56 +08:00
parent 39ee23f4c3
commit 6ee6ee226b
No known key found for this signature in database
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/julia/patches/1.8/0001-skip-symlink-system-libraries.patch
View File

@ -1,4 +1,4 @@
From f342b6bfab5eee9c7fea9ddc8804d9a5ff6953eb Mon Sep 17 00:00:00 2001
From 1faa30525c9671ffd3a08901896b521a040d7e5c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 20 Sep 2022 18:42:08 +0800
Subject: [PATCH 1/4] skip symlink system libraries
@ -8,7 +8,7 @@ Subject: [PATCH 1/4] skip symlink system libraries
1 file changed, 2 deletions(-)
diff --git a/base/Makefile b/base/Makefile
index 23a9c40..12f92aa 100644
index 23a9c4011..12f92aa05 100644
--- a/base/Makefile
+++ b/base/Makefile
@@ -181,7 +181,6 @@ $$(build_private_libdir)/$$(libname_$2):
@ -28,5 +28,5 @@ index 23a9c40..12f92aa 100644
endif
--
2.37.2
2.38.1

6
pkgs/development/compilers/julia/patches/1.8/0002-skip-building-doc.patch
View File

@ -1,4 +1,4 @@
From 6a7723be33261cdc302e0f7bdb37fb50d30cc5fc Mon Sep 17 00:00:00 2001
From 05c008dcabaf94f5623f2f7e267005eef0a8c5fc Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 20 Sep 2022 18:42:31 +0800
Subject: [PATCH 2/4] skip building doc
@ -8,7 +8,7 @@ Subject: [PATCH 2/4] skip building doc
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index d38311d..a775d36 100644
index d38311dce..a775d36e1 100644
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,7 @@ define stringreplace
@ -21,5 +21,5 @@ index d38311d..a775d36 100644
@$(MAKE) $(QUIET_MAKE) all
else
--
2.37.2
2.38.1

8
pkgs/development/compilers/julia/patches/1.8/0003-skip-failing-tests.patch
View File

@ -1,4 +1,4 @@
From a57c582eabc4703ed627b32f7f11893db9676fb6 Mon Sep 17 00:00:00 2001
From 756d4e977f8f224e20effa82c612e5a9cc14d82e Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 20 Sep 2022 18:42:59 +0800
Subject: [PATCH 3/4] skip failing tests
@ -8,7 +8,7 @@ Subject: [PATCH 3/4] skip failing tests
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/Makefile b/test/Makefile
index 24e137a..0e82acf 100644
index 24e137a5b..c17ccea8a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,7 +23,7 @@ default:
@ -16,10 +16,10 @@ index 24e137a..0e82acf 100644
$(TESTS):
@cd $(SRCDIR) && \
- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
+ $(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 $@)
+ $(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 $@)
$(addprefix revise-, $(TESTS)): revise-% :
@cd $(SRCDIR) && \
--
2.37.2
2.38.1

6
pkgs/development/compilers/julia/patches/1.8/0004-ignore-absolute-path-when-loading-library.patch
View File

@ -1,4 +1,4 @@
From a60100f06f48fbb4697aced65175bf3d41185e3e Mon Sep 17 00:00:00 2001
From c0e587f4c50bd7bedfe6e5102e9b47c9704fac9b Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 20 Sep 2022 18:43:15 +0800
Subject: [PATCH 4/4] ignore absolute path when loading library
@ -8,7 +8,7 @@ Subject: [PATCH 4/4] ignore absolute path when loading library
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/cli/loader_lib.c b/cli/loader_lib.c
index 0301b6e..5cbda61 100644
index 0301b6eed..5cbda61af 100644
--- a/cli/loader_lib.c
+++ b/cli/loader_lib.c
@@ -50,9 +50,7 @@ static void * load_library(const char * rel_path, const char * src_dir, int err)
@ -23,5 +23,5 @@ index 0301b6e..5cbda61 100644
#if defined(_OS_WINDOWS_)
wchar_t wpath[2*JL_PATH_MAX + 1] = {0};
--
2.37.2
2.38.1