From c24c15374357c256c8aa8a94c0418008b4e0950b Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 25 Jan 2016 17:51:15 +0100 Subject: [PATCH] Add Ruby 2.3.0 package --- pkgs/development/interpreters/ruby/default.nix | 12 ++++++++++++ pkgs/development/interpreters/ruby/patchsets.nix | 5 +++++ pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 ++++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index e5e17e142f4..4ffef385a0d 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -255,4 +255,16 @@ in { git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; }; }; + + ruby_2_3_0 = generic { + majorVersion = "2"; + minorVersion = "3"; + teenyVersion = "0"; + patchLevel = "0"; + sha256 = { + # src = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; + src = "01z5cya4a7y751d4pb3aak5qcwmmvnwkbgz9z171p8hsbw7acnxs"; + git = "0nl0pp96m0jxi422mqx09jqn9bff90pzz0xxa0ikrx7by0g00npg"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 286301dc0a5..18e2ab9231a 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -141,4 +141,9 @@ rec { "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.3.0" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index f12402f0a0b..238a70b5d80 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "8ccf24490fec2218374734520c27d925078096de"; - sha256 = "88418484d2d3963975190836eafb2e28206e3e2bac9ee7c6208645bfe7428e2f"; + rev = "84d0634ce5639781c4d8e9396ec20341d6524901"; + sha256 = "06x2r43i8kpcmk6s5idrc3z49p8vy18b2lsh1jdqla69i5z2vqlf"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1848c35737b..8bcfa213ab0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5363,14 +5363,16 @@ let ruby_1_9_3 ruby_2_0_0 ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7 - ruby_2_2_0 ruby_2_2_2 ruby_2_2_3; + ruby_2_2_0 ruby_2_2_2 ruby_2_2_3 + ruby_2_3_0; # Ruby aliases - ruby = ruby_2_2; + ruby = ruby_2_3; ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_7; ruby_2_2 = ruby_2_2_3; + ruby_2_3 = ruby_2_3_0; rubygems = hiPrio (callPackage ../development/interpreters/ruby/rubygems.nix {});