diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2018-10-17 20:05:14 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2018-10-17 20:12:47 -0500 |
| commit | ce0bec2baa81def4889a79969b379f43d9c5582f (patch) | |
| tree | 36c70a37a213ce054c5f8d7782468dc53b66b569 /pkgs/development/interpreters/ruby | |
| parent | ee9d62241cf5c6b24838c5b2f472c8ddc4e9ba08 (diff) | |
| download | nixpkgs-ce0bec2baa81def4889a79969b379f43d9c5582f.tar nixpkgs-ce0bec2baa81def4889a79969b379f43d9c5582f.tar.gz nixpkgs-ce0bec2baa81def4889a79969b379f43d9c5582f.tar.bz2 nixpkgs-ce0bec2baa81def4889a79969b379f43d9c5582f.tar.lz nixpkgs-ce0bec2baa81def4889a79969b379f43d9c5582f.tar.xz nixpkgs-ce0bec2baa81def4889a79969b379f43d9c5582f.tar.zst nixpkgs-ce0bec2baa81def4889a79969b379f43d9c5582f.zip | |
ruby_2_5: 2.5.1 -> 2.5.2
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index e2b4730b0d0..4120124d9ba 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -111,8 +111,8 @@ let postPatch = if isRuby25 then '' sed -i configure.ac -e '/config.guess/d' - cp ${config}/config.guess tool/ - cp ${config}/config.sub tool/ + cp --remove-destination ${config}/config.guess tool/ + cp --remove-destination ${config}/config.sub tool/ '' else opString useRailsExpress '' sed -i configure.in -e '/config.guess/d' @@ -218,10 +218,10 @@ in { }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "1" ""; + version = rubyVersion "2" "5" "2" ""; sha256 = { - src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s"; - git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj"; + src = "0wgl1697sdiqh6ksgv40v627jp5557j1zi462krwnzhc9bk408xk"; + git = "00xy323q2f2v102hfgsj9k20vggvvmyhd6byfhbc1qwz2vyrvc47"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index bf4a406e987..151e9c48353 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ rec { "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.1" = ops useRailsExpress [ + "2.5.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" |