From bff2b98290b7167db60af97b0d6ac8fa280699d2 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 25 Nov 2016 11:24:07 +0100 Subject: [PATCH] ruby: 3.2.1 -> 2.3.3 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 336c861bbdc..9486d030a8b 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -211,11 +211,11 @@ in { }; }; - ruby_2_3_1 = generic { - version = rubyVersion "2" "3" "1" ""; + ruby_2_3_3 = generic { + version = rubyVersion "2" "3" "3" ""; sha256 = { - src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q"; - git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r"; + src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514"; + git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 4c1321b5b87..d21e7d669dc 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -60,4 +60,9 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.3.3" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a69dcf75bb..93d96737261 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5713,7 +5713,7 @@ in ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 - ruby_2_3_1; + ruby_2_3_3; # Ruby aliases ruby = ruby_2_3; @@ -5721,7 +5721,7 @@ in ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; - ruby_2_3 = ruby_2_3_1; + ruby_2_3 = ruby_2_3_3; scsh = callPackage ../development/interpreters/scsh { };