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: ba519fb2a3c9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de0373bbe2d7
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 4, 2019

  1. ruby_2_6: add missing rvm patchset (#56461)

    @marsam @zimbatm
    marsam authored and zimbatm committed Mar 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    politas Myk
    GPG key ID: 47938AAEAD85818F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de0373b View commit details
Showing with 6 additions and 3 deletions.
  1. +4 −1 pkgs/development/interpreters/ruby/patchsets.nix
  2. +2 −2 pkgs/development/interpreters/ruby/rvm-patchsets.nix
5 changes: 4 additions & 1 deletion pkgs/development/interpreters/ruby/patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,9 @@ rec {
"${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.1" = ops useRailsExpress [ # no Rails Express patchset yet (2019-01-30)
"2.6.1" = 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"
];
}
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 = "ba5a3c6f972e1b957b4b3fe28b5730ef0e27bff3";
sha256 = "0sjmhhb8hshxa58x062j44w0xdck8ykgpsg33wjr0wv9npwpkwrz";
rev = "bdb42b13dd8653afc64676c0feb350e0c1880119";
sha256 = "09fpx66cshyvrrmp3251d2pmqv0frjw940r421smsmpkny0dx613";
}