diff options
author | Michael Fellinger <michael.fellinger@xing.com> | 2018-08-28 14:00:30 +0200 |
---|---|---|
committer | Michael Fellinger <michael.fellinger@xing.com> | 2018-08-28 14:38:48 +0200 |
commit | baefa983d3bb9c248dedc4dc4aaa096acc8f0aea (patch) | |
tree | 88fa3f17240a38b03dce2dde7a47109588a295bf | |
parent | c251ec691a559e3769879bf3e4a8a22e78f4e6ce (diff) | |
download | nixlib-baefa983d3bb9c248dedc4dc4aaa096acc8f0aea.tar nixlib-baefa983d3bb9c248dedc4dc4aaa096acc8f0aea.tar.gz nixlib-baefa983d3bb9c248dedc4dc4aaa096acc8f0aea.tar.bz2 nixlib-baefa983d3bb9c248dedc4dc4aaa096acc8f0aea.tar.lz nixlib-baefa983d3bb9c248dedc4dc4aaa096acc8f0aea.tar.xz nixlib-baefa983d3bb9c248dedc4dc4aaa096acc8f0aea.tar.zst nixlib-baefa983d3bb9c248dedc4dc4aaa096acc8f0aea.zip |
ruby: default to version 2.5
-rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index e53f231884d9..ca180b3c2294 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 e176844738fc..b7585e49ccf3 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 { }; |