diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-01 11:17:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 11:17:13 +0100 |
| commit | b29aff5a05af459244f37b402632147d92120f2f (patch) | |
| tree | b60ea74910baa6f6a985691c09d69e6499815182 | |
| parent | a902ac91fe7fd203327d9127624a158921e5738f (diff) | |
| parent | baefa983d3bb9c248dedc4dc4aaa096acc8f0aea (diff) | |
| download | nixlib-b29aff5a05af459244f37b402632147d92120f2f.tar nixlib-b29aff5a05af459244f37b402632147d92120f2f.tar.gz nixlib-b29aff5a05af459244f37b402632147d92120f2f.tar.bz2 nixlib-b29aff5a05af459244f37b402632147d92120f2f.tar.lz nixlib-b29aff5a05af459244f37b402632147d92120f2f.tar.xz nixlib-b29aff5a05af459244f37b402632147d92120f2f.tar.zst nixlib-b29aff5a05af459244f37b402632147d92120f2f.zip | |
Merge pull request #45705 from manveru/ruby-2.5-default
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 c182449b62bf..943f09a842eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7720,7 +7720,7 @@ with pkgs; ruby_2_4 ruby_2_5; - ruby = ruby_2_4; + ruby = ruby_2_5; mruby = callPackage ../development/compilers/mruby { }; |