diff options
| author | Rahul Gopinath <rahul@gopinath.org> | 2016-07-30 11:58:31 -0700 |
|---|---|---|
| committer | Rahul Gopinath <rahul@gopinath.org> | 2016-09-06 21:13:59 -0700 |
| commit | 7163bab78f7945fa2664a72aef12e67fa9bf0781 (patch) | |
| tree | 16fb1e8efdf2a1812ac27c3fa1b7ed284f40db16 /pkgs/development/interpreters | |
| parent | 39e197ab1ccad9f1b57c10afe4cfe592a9e40270 (diff) | |
| download | nixlib-7163bab78f7945fa2664a72aef12e67fa9bf0781.tar nixlib-7163bab78f7945fa2664a72aef12e67fa9bf0781.tar.gz nixlib-7163bab78f7945fa2664a72aef12e67fa9bf0781.tar.bz2 nixlib-7163bab78f7945fa2664a72aef12e67fa9bf0781.tar.lz nixlib-7163bab78f7945fa2664a72aef12e67fa9bf0781.tar.xz nixlib-7163bab78f7945fa2664a72aef12e67fa9bf0781.tar.zst nixlib-7163bab78f7945fa2664a72aef12e67fa9bf0781.zip | |
ruby: 2.2.3 -> 2.2.5
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 51f16360f8bf..491d43f4c989 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -198,14 +198,14 @@ in { }; }; - ruby_2_2_3 = generic { + ruby_2_2_5 = generic { majorVersion = "2"; minorVersion = "2"; - teenyVersion = "3"; + teenyVersion = "5"; patchLevel = "0"; sha256 = { - src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz"; - git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; + src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h"; + git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index bf848aba5825..b5a60f6e13fa 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -50,13 +50,10 @@ rec { "${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.2.3" = [ - ./ssl_v3.patch - ./ruby22-rand-egd.patch - ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch" - "${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.2.5" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch" ]; "2.3.1" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 238a70b5d807..bbe1038bab2f 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 = "84d0634ce5639781c4d8e9396ec20341d6524901"; - sha256 = "06x2r43i8kpcmk6s5idrc3z49p8vy18b2lsh1jdqla69i5z2vqlf"; + rev = "951e47ca1022cd1e41de9177fa87438cfb72d127"; + sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf"; } |