From baefa983d3bb9c248dedc4dc4aaa096acc8f0aea Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 28 Aug 2018 14:00:30 +0200 Subject: [PATCH] ruby: default to version 2.5 --- pkgs/development/interpreters/ruby/patchsets.nix | 5 ----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index e53f231884d935..ca180b3c2294fb 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,11 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel }: rec { - "2.2.9" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; "2.3.7" = 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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e176844738fc6a..b7585e49ccf37d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7722,7 +7722,7 @@ with pkgs; ruby_2_4 ruby_2_5; - ruby = ruby_2_4; + ruby = ruby_2_5; mruby = callPackage ../development/compilers/mruby { };