about summary refs log tree commit diff
path: root/pkgs/development/compilers/mruby
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2019-05-12 22:27:38 -0400
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2019-05-13 19:27:27 -0400
commit251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2 (patch)
tree326de8f054a2c4378ebe0ec90104a9d1908f1d7d /pkgs/development/compilers/mruby
parent190727db4ea7e0d083e7dbcb66ced11f31b340f0 (diff)
downloadnixlib-251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2.tar
nixlib-251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2.tar.gz
nixlib-251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2.tar.bz2
nixlib-251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2.tar.lz
nixlib-251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2.tar.xz
nixlib-251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2.tar.zst
nixlib-251c22ad10c2f23a992b6608a5b1c99a4d3b3bb2.zip
mruby: 2.0.0 -> 2.0.1
Diffstat (limited to 'pkgs/development/compilers/mruby')
-rw-r--r--pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch36
-rw-r--r--pkgs/development/compilers/mruby/default.nix10
2 files changed, 3 insertions, 43 deletions
diff --git a/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch b/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
deleted file mode 100644
index 779391fc62a9..000000000000
--- a/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch
+++ /dev/null
@@ -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
-
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index cfc1f00a8036..03f3d56fd93d 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/pkgs/development/compilers/mruby/default.nix
@@ -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.