diff options
author | Rahul Gopinath <rahul@gopinath.org> | 2016-07-30 15:15:52 -0700 |
---|---|---|
committer | Rahul Gopinath <rahul@gopinath.org> | 2016-09-06 21:14:00 -0700 |
commit | 3b9b8726bdbb5405919c40920d9693c5eae246b5 (patch) | |
tree | 307226ffba02f422e88925b54f37208cf4bdab49 /pkgs/development/interpreters | |
parent | 7163bab78f7945fa2664a72aef12e67fa9bf0781 (diff) |
ruby: 2.1.7 -> 2.1.10
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 22 |
2 files changed, 16 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 491d43f4c989..bdeb5d02065b 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -147,6 +147,7 @@ let license = stdenv.lib.licenses.ruby; homepage = http://www.ruby-lang.org/en/; description = "The Ruby language"; + maintainers = [ stdenv.lib.maintainers.vrthra ]; platforms = stdenv.lib.platforms.all; }; @@ -187,14 +188,14 @@ in { }; }; - ruby_2_1_7 = generic { + ruby_2_1_10 = generic { majorVersion = "2"; minorVersion = "1"; - teenyVersion = "7"; + teenyVersion = "10"; patchLevel = "0"; sha256 = { - src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m"; - git = "1fmbqd943akqjwsfbj9bg394ac46qmpavm8s0kv2w87rflrjcjfb"; + src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv"; + git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index b5a60f6e13fa..4c1321b5b873 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -36,19 +36,19 @@ rec { "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" ]; - "2.1.7" = [ - ./ssl_v3.patch + "2.1.10" = [ ./rand-egd.patch ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/05-funny-falcon-stc-density.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/06-funny-falcon-stc-pool-allocation.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/07-aman-opt-aset-aref-str.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch" + # 2.1.10 patchsets are not available, but 2.1.8 patchsets apply + "${patchSet}/patches/ruby/2.1.8/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/03-display-more-detailed-stack-trace.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/05-funny-falcon-stc-density.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/06-funny-falcon-stc-pool-allocation.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/07-aman-opt-aset-aref-str.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; "2.2.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" |