git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147685 from ninjin/julia-bin_164

julia_16-bin: 1.6.3 -> 1.6.4

commit89bb06e7b5df8ed456f6d25f24f103874e79beb5 author7c6f434c <7c6f434c@mail.ru> dateSun 28 Nov 2021, 14:50 (5 years ago) parent48bc3c69d80a43
2 files changed+2−31
compare with master
unifiedsplit
pkgs/development/compilers/julia/1.6-bin.nix+2−3 pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch−28
pkgs/development/compilers/julia/1.6-bin.nix+2−3
@@ -2,12 +2,12 @@
22
33stdenv.mkDerivation rec {
44 pname = "julia-bin";
5− version = "1.6.3";
5+ version = "1.6.4";
66
77 src = {
88 x86_64-linux = fetchurl {
99 url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
10− sha256 = "0jrijj9snfx70692z2301rjassvwjcsjbxdsjyif9hyp9hrrqif7";
10+ sha256 = "0ci1dd8g1pgpp6j1v971zg8xpw120hdjblf9zcyhgs4pfvj4l92j";
1111 };
1212 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
1313
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
1919 '';
2020 patches = [
2121 # Source release Nix patch(es) relevant for binary releases as well.
22− ./patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch
2322 ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch
2423 ];
2524 postPatch = ''
pkgs/development/compilers/julia/patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patchdeleted−28
@@ -1,28 +0,0 @@
1−From ffe227676352a910754d96d92e9b06e475f28ff1 Mon Sep 17 00:00:00 2001
2−From: Pontus Stenetorp <pontus@stenetorp.se>
3−Date: Thu, 8 Apr 2021 04:25:19 +0000
4−Subject: [PATCH 2/6] nix: Skip `tempname` test broken in sandbox
5−
6−Reported upstream:
7−
8− https://github.com/JuliaLang/julia/issues/38873
9−---
10− test/file.jl | 2 +-
11− 1 file changed, 1 insertion(+), 1 deletion(-)
12−
13−diff --git a/test/file.jl b/test/file.jl
14−index 0f39bc7c14..bd4dd78f62 100644
15−--- a/test/file.jl
16−+++ b/test/file.jl
17−@@ -95,7 +95,7 @@ end
18− @test dirname(t) == tempdir()
19− mktempdir() do d
20− t = tempname(d)
21−- @test dirname(t) == d
22−+ @test_skip dirname(t) == d
23− end
24− @test_throws ArgumentError tempname(randstring())
25− end
26−--
27−2.29.3
28−