mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
julia_16-bin: 1.6.2 -> 1.6.3
Patches: https://github.com/JuliaLang/julia/compare/v1.6.2...v1.6.3
Dropping `chown` test workaround patch as it is now fixed upstream:
3e8eb9e8de
This commit is contained in:
parent
1737f98af6
commit
c43789e7bb
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
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 = "0h1jh8gbvxb0pl1an0fbbg4lbd0sa24yj2f4yqwavw8dbdvvbd1y";
|
||||
sha256 = "0jrijj9snfx70692z2301rjassvwjcsjbxdsjyif9hyp9hrrqif7";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@ -20,7 +20,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/0003-nix-Skip-chown-tests-broken-in-sandbox.patch
|
||||
./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch
|
||||
];
|
||||
postPatch = ''
|
||||
|
@ -1,27 +0,0 @@
|
||||
From b20357fb1044d2c100172b1d5cbdf6c6d9bd3590 Mon Sep 17 00:00:00 2001
|
||||
From: Pontus Stenetorp <pontus@stenetorp.se>
|
||||
Date: Thu, 8 Apr 2021 05:10:39 +0000
|
||||
Subject: [PATCH 3/6] nix: Skip `chown` tests broken in sandbox
|
||||
|
||||
---
|
||||
test/file.jl | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/file.jl b/test/file.jl
|
||||
index bd4dd78f62..06fd4e49da 100644
|
||||
--- a/test/file.jl
|
||||
+++ b/test/file.jl
|
||||
@@ -503,8 +503,8 @@ if !Sys.iswindows()
|
||||
@test stat(file).gid == 0
|
||||
@test stat(file).uid == 0
|
||||
else
|
||||
- @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user
|
||||
- @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup)
|
||||
+ @test_skip @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user
|
||||
+ @test_skip @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup)
|
||||
end
|
||||
else
|
||||
# test that chown doesn't cause any errors for Windows
|
||||
--
|
||||
2.29.3
|
||||
|
Loading…
Reference in New Issue
Block a user