diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-06-04 18:57:40 -0400 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2024-06-04 19:01:45 -0400 |
| commit | e0399f66a7f215a18393ccfeea6b5f9413230f81 (patch) | |
| tree | a4c11a30fc6c9626e5ca10fe5fda564598291562 /pkgs/development/compilers | |
| parent | ab880c58dce600e663c7314de1a884071db84639 (diff) | |
julia_110: 1.10.3 -> 1.10.4
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/julia/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch | 34 |
2 files changed, 2 insertions, 37 deletions
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 7b1b19cb3f7c4..becbd64ea55b2 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -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 ]; }) diff --git a/pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch b/pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch deleted file mode 100644 index 6ff33b342cfdc..0000000000000 --- a/pkgs/development/compilers/julia/patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch +++ /dev/null @@ -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 - |