Merge pull request #61418 from samueldr/update/mruby/2.0.1

mruby: 2.0.0 -> 2.0.1
This commit is contained in:
Renaud 2019-05-14 10:15:42 +02:00 committed by GitHub
commit 03a48d4871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 43 deletions

View File

@ -1,36 +0,0 @@
From f3db284516105fd30b5513a5528104574a7b8545 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 9 Aug 2018 19:07:45 -0400
Subject: [PATCH] Disables `IO#isatty` test for sandboxed builds.
---
mrbgems/mruby-io/test/io.rb | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb
index e06b1499..e8a54736 100644
--- a/mrbgems/mruby-io/test/io.rb
+++ b/mrbgems/mruby-io/test/io.rb
@@ -342,19 +342,6 @@ assert('IO#_read_buf') do
io.closed?
end
-assert('IO#isatty') do
- skip "isatty is not supported on this platform" if MRubyIOTestUtil.win?
- f1 = File.open("/dev/tty")
- f2 = File.open($mrbtest_io_rfname)
-
- assert_true f1.isatty
- assert_false f2.isatty
-
- f1.close
- f2.close
- true
-end
-
assert('IO#pos=, IO#seek') do
fd = IO.sysopen $mrbtest_io_rfname
io = IO.new fd
--
2.16.4

View File

@ -1,20 +1,16 @@
{ stdenv, ruby, bison, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "mruby-${version}";
version = "2.0.0";
pname = "mruby";
version = "2.0.1";
src = fetchFromGitHub {
owner = "mruby";
repo = "mruby";
rev = version;
sha256 = "1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5";
sha256 = "1zm2d5kj9fnfx8ifj8ysrrr838ipwmvz35byzjhprakrg64911p9";
};
patches = [
./0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
];
nativeBuildInputs = [ ruby bison ];
# Necessary so it uses `gcc` instead of `ld` for linking.