mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

julia_110: 1.10.3 -> 1.10.4

Browse Source
This commit is contained in:
Nick Cao 2024-06-04 18:57:40 -04:00
parent ab880c58dc
commit e0399f66a7
No known key found for this signature in database
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/julia/default.nix
View File

@ -50,10 +50,9 @@ in
{ });
julia_110 = wrapJulia (callPackage
(import ./generic.nix {
version = "1.10.3";
hash = "sha256-2JKyEjvmTaz50F5My61/F5f2v4fDl6dIBLARyHUPbI8=";
version = "1.10.4";
hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE=";
patches = [
./patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch
./patches/1.10/0002-skip-failing-and-flaky-tests.patch
];
})

34
pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch
View File

@ -1,34 +0,0 @@
From da7e7b2c622bcfdc3e6484a64ade50d22d52c4dd Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 10 Jan 2024 19:48:19 -0500
Subject: [PATCH 1/2] skip building docs as it requires network access
---
Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 1565014a0f..edd5c65244 100644
--- a/Makefile
+++ b/Makefile
@@ -265,7 +265,7 @@ define stringreplace
endef
-install: $(build_depsbindir)/stringreplace docs
+install: $(build_depsbindir)/stringreplace
@$(MAKE) $(QUIET_MAKE) $(JULIA_BUILD_MODE)
@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
mkdir -p $(DESTDIR)$$subdir; \
@@ -368,8 +368,6 @@ endif
cp -R -L $(JULIAHOME)/base/* $(DESTDIR)$(datarootdir)/julia/base
cp -R -L $(JULIAHOME)/test/* $(DESTDIR)$(datarootdir)/julia/test
cp -R -L $(build_datarootdir)/julia/* $(DESTDIR)$(datarootdir)/julia
- # Copy documentation
- cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
# Remove various files which should not be installed
-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
--
2.43.0