Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f2ffac1ee4a0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f0b18a3f96fc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 2, 2019

  1. ruby_2_4: 2.4.5 -> 2.4.9 

    Changelog:
- https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-4-8-released/
- https://www.ruby-lang.org/en/news/2019/10/02/ruby-2-4-9-released/

(cherry picked from commit 5ed9d8b)
    @marsam @alyssais
    marsam authored and alyssais committed Oct 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    acb6871 View commit details

  2. ruby_2_5: 2.5.3 -> 2.5.7 

    Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-5-7-released/
(cherry picked from commit 5e76e7b)
    @marsam @alyssais
    marsam authored and alyssais committed Oct 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f0b18a3 View commit details
Showing with 8 additions and 8 deletions.
  1. +6 −6 pkgs/development/interpreters/ruby/default.nix
  2. +2 −2 pkgs/development/interpreters/ruby/patchsets.nix
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -210,18 +210,18 @@ in {
};

ruby_2_4 = generic {
version = rubyVersion "2" "4" "5" "";
version = rubyVersion "2" "4" "9" "";
sha256 = {
src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7";
git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43";
src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr";
git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c";
};
};

ruby_2_5 = generic {
version = rubyVersion "2" "5" "3" "";
version = rubyVersion "2" "5" "7" "";
sha256 = {
src = "0v4442aqqlzxwc792kbkfs2k61qg97r680is6gx20z63a8wd0a4q";
git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2";
src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
};
};
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/ruby/patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ rec {
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.4.5" = ops useRailsExpress [
"2.4.9" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
"${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.3" = ops useRailsExpress [
"2.5.7" = 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"