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: ba3313cb6cae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 46026e824787
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 16, 2019

  1. ruby: update RVM patchsets

    @marsam
    marsam committed Mar 16, 2019
    Copy the full SHA
    69d80d7 View commit details

  2. ruby_2_5: 2.5.3 -> 2.5.5

    @marsam
    marsam committed Mar 16, 2019
    Copy the full SHA
    cadc359 View commit details

  3. ruby_2_6: 2.6.1 -> 2.6.2

    @marsam
    marsam committed Mar 16, 2019
    Copy the full SHA
    342773c View commit details

Commits on Mar 17, 2019

  1. Merge commit 'refs/pull/57762/head' of https://github.com/NixOS/nixpkgs… 

    … into master
    @alyssais
    alyssais committed Mar 17, 2019
    Copy the full SHA
    46026e8 View commit details
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -215,18 +215,18 @@ in {
};

ruby_2_5 = generic {
version = rubyVersion "2" "5" "3" "";
version = rubyVersion "2" "5" "5" "";
sha256 = {
src = "0v4442aqqlzxwc792kbkfs2k61qg97r680is6gx20z63a8wd0a4q";
git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2";
src = "0k2in88jymqh727s88yjsv7wrqs2hdj9h2w9zh2bmrj0ygylba98";
git = "0l7b7xv48gvvlqs27gghfi645qvc1nwiz8ym4j8w100rzzzfy6zz";
};
};

ruby_2_6 = generic {
version = rubyVersion "2" "6" "1" "";
version = rubyVersion "2" "6" "2" "";
sha256 = {
src = "1f0w37jz2ryvlx260rw3s3wl0wg7dkzphb54lpvrqg90pfvly0hp";
git = "07gp7df1izw9rdbp9ciw4q5kq8icx3zd5w1xrhwsw0dfbsmmnsrj";
src = "1as97d2j0d21g8mldp8fmdjah96jakrxyw1v0crg7ln2y8mmsh50";
git = "0f4mnrd7733353kx1jjha770kvm0wlc59z7id9h23kmjdg6k76nl";
};
};
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/ruby/patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ 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.3" = ops useRailsExpress [
"2.5.5" = 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.1" = ops useRailsExpress [
"2.6.2" = 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 = "bdb42b13dd8653afc64676c0feb350e0c1880119";
sha256 = "09fpx66cshyvrrmp3251d2pmqv0frjw940r421smsmpkny0dx613";
rev = "e6e12c2c32ff184e0409d8f9f2a870f2dfbd06a3";
sha256 = "0n71h2ip1k18icb3bcr1jz4161lh6vr6i3f7b45jswg77c4rrxcy";
}