Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 33c19df80d98
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f82e22f7053
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 1, 2020

  1. ruby: update RVM patchsets 

    (cherry picked from commit dd24a2f)
    @marsam @alyssais
    marsam authored and alyssais committed Apr 1, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    959a1a3 View commit details

  2. ruby_2_5: 2.5.7 -> 2.5.8 

    Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-5-8-released/
(cherry picked from commit 99b09d6)
    @marsam @alyssais
    marsam authored and alyssais committed Apr 1, 2020
    Copy the full SHA
    4556842 View commit details

  3. ruby_2_6: 2.6.5 -> 2.6.6 

    Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-6-6-released/
(cherry picked from commit b312ecf)
    @marsam @alyssais
    marsam authored and alyssais committed Apr 1, 2020
    Copy the full SHA
    8ea9745 View commit details

  4. ruby_2_7: 2.7.0 -> 2.7.1 

    Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-7-1-released/
(cherry picked from commit a7f1e9f)
    @marsam @alyssais
    marsam authored and alyssais committed Apr 1, 2020
    Copy the full SHA
    7f82e22 View commit details
18 changes: 9 additions & 9 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -224,26 +224,26 @@ let

in {
ruby_2_5 = generic {
version = rubyVersion "2" "5" "7" "";
version = rubyVersion "2" "5" "8" "";
sha256 = {
src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
src = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc";
git = "19gkk3q9l33cwkfsp5k8f8fipq7gkyqkqirm9farbvy425519rv2";
};
};

ruby_2_6 = generic {
version = rubyVersion "2" "6" "5" "";
version = rubyVersion "2" "6" "6" "";
sha256 = {
src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
src = "1492x795qzgp3zhpl580kd1sdp50n5hfsmpbfhdsq2rnxwyi8jrn";
git = "1jr9v99a7awssqmw7531afbx4a8i9x5yfqyffha545g7r4s7kj50";
};
};

ruby_2_7 = generic {
version = rubyVersion "2" "7" "0" "";
version = rubyVersion "2" "7" "1" "";
sha256 = {
src = "1glc3zpnih6h8mrgfcak0aa7cgmi4zyvxfyi6y2brwg2nn9sm6cc";
git = "11iz64k95czs273mb10195d1j75mmbcgddfdx1vay5876ffw81dq";
src = "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l";
git = "0qk729kr5wm67xmwpljpdprwhp5wvn5y4ikqy00p1zcgwlwdcs33";
};
};
}
9 changes: 6 additions & 3 deletions pkgs/development/interpreters/ruby/patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -6,16 +6,19 @@
"${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.7" = ops useRailsExpress [
"2.5.8" = 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"
];
"2.6.5" = ops useRailsExpress [
"2.6.6" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"2.7.0" = ops useRailsExpress [ # no patches yet (2019-12-25)
"2.7.1" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/ruby/rvm-patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "skaes";
repo = "rvm-patchsets";
rev = "58f72dccc8bb4dc9b1035f6af903d21f2465367a";
sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag";
rev = "6d8888d34a321198f7fd9253343b78c209efb046";
sha256 = "0xczl0nng1649km3bcbjn6zrr591l6m2kkwgnknh1fnwmmrdaya7";
}