From 9d80a43612af5e1a50bfab734aac0e5a88ad8e60 Mon Sep 17 00:00:00 2001
From: Pontus Stenetorp <pontus@stenetorp.se>
Date: Sun, 28 Nov 2021 09:42:19 +0000
Subject: [PATCH] julia_16-bin: 1.6.3 -> 1.6.4

Patches: https://github.com/JuliaLang/julia/compare/v1.6.3...v1.6.4

Broken `tempname` tests disabled upstream, dropping workaround patch:

    https://github.com/JuliaLang/julia/pull/43012

The issue itself however, persists:

    https://github.com/JuliaLang/julia/issues/35785
---
 pkgs/development/compilers/julia/1.6-bin.nix  |  5 ++--
 ...Skip-tempname-test-broken-in-sandbox.patch | 28 -------------------
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch

diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix
index ad6083a1ea3b..5743681ae7f0 100644
--- a/pkgs/development/compilers/julia/1.6-bin.nix
+++ b/pkgs/development/compilers/julia/1.6-bin.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "julia-bin";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = {
     x86_64-linux = fetchurl {
       url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
-      sha256 = "0jrijj9snfx70692z2301rjassvwjcsjbxdsjyif9hyp9hrrqif7";
+      sha256 = "0ci1dd8g1pgpp6j1v971zg8xpw120hdjblf9zcyhgs4pfvj4l92j";
     };
   }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   '';
   patches = [
     # Source release Nix patch(es) relevant for binary releases as well.
-    ./patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch
     ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch
   ];
   postPatch = ''
diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch b/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch
deleted file mode 100644
index d47efe25c5a0..000000000000
--- a/pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ffe227676352a910754d96d92e9b06e475f28ff1 Mon Sep 17 00:00:00 2001
-From: Pontus Stenetorp <pontus@stenetorp.se>
-Date: Thu, 8 Apr 2021 04:25:19 +0000
-Subject: [PATCH 2/6] nix: Skip `tempname` test broken in sandbox
-
-Reported upstream:
-
-    https://github.com/JuliaLang/julia/issues/38873
----
- test/file.jl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/file.jl b/test/file.jl
-index 0f39bc7c14..bd4dd78f62 100644
---- a/test/file.jl
-+++ b/test/file.jl
-@@ -95,7 +95,7 @@ end
-     @test dirname(t) == tempdir()
-     mktempdir() do d
-         t = tempname(d)
--        @test dirname(t) == d
-+        @test_skip dirname(t) == d
-     end
-     @test_throws ArgumentError tempname(randstring())
- end
--- 
-2.29.3
-