Unverified Commit 4b86c70c authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #317316 from NickCao/julia 

julia_110{,-bin}: 1.10.3 -> 1.10.4
parents 1dbbb9be e0399f66

pkgs/development/compilers/julia/default.nix

+7 −8
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ in 
    { });

  julia_110-bin = wrapJulia (callPackage

    (import ./generic-bin.nix {

      version = "1.10.3";

      version = "1.10.4";

      sha256 = {

        x86_64-linux = "81b910c922fff0e27ae1f256f2cc803db81f3960215281eddd2d484721928c70";

        aarch64-linux = "2d52a61826872b3170c65f99a954bd9d21a31211cb50948056d924f811a0024f";

        x86_64-darwin = "af61600db0abdc56fffb1b47cd18c30213b8925796546b53b657e164126082b4";

        aarch64-darwin = "9ea32daa1bef34c8e48d6c76187f48fd2bf1054cc921fb8c374b737b51c9ffdd";

        x86_64-linux = "079f61757c3b5b40d2ade052b3cc4816f50f7ef6df668825772562b3746adff1";

        aarch64-linux = "ae4ae6ade84a103cdf30ce91c8d4035a0ef51c3e2e66f90a0c13abeb4e100fc4";

        x86_64-darwin = "259c18a5294dd41cc60117ecb9fc5a8b2f659807284903a65439fb9d3818c763";

        aarch64-darwin = "97b88d7f9b5724118769f3a3bd259f8f7ada48cdecf3d584cf68162dd873dd10";

      };

    })

    { });
@@ -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

      ];

    })

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

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
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