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

Commits on Oct 2, 2019

  1. ruby: remove ruby_2_3 patchset 

    d3983ca removed ruby_2_3 from nixpkgs
    @marsam @alyssais
    marsam authored and alyssais committed Oct 2, 2019
    Copy the full SHA
    befd5c9 View commit details

  2. ruby_2_5: 2.6.4 -> 2.6.5 

    Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-6-5-released/
    @marsam @alyssais
    marsam authored and alyssais committed Oct 2, 2019
    Copy the full SHA
    4ee22f3 View commit details

  3. ruby_2_5: 2.5.6 -> 2.5.7 

    Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-5-7-released/
    @marsam @alyssais
    marsam authored and alyssais committed Oct 2, 2019
    Copy the full SHA
    5e76e7b View commit details

  4. ruby_2_4: 2.4.7 -> 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/
    @marsam @alyssais
    marsam authored and alyssais committed Oct 2, 2019
    Copy the full SHA
    5ed9d8b View commit details
Showing with 12 additions and 22 deletions.
  1. +9 −9 pkgs/development/interpreters/ruby/default.nix
  2. +3 −13 pkgs/development/interpreters/ruby/patchsets.nix
18 changes: 9 additions & 9 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -212,26 +212,26 @@ let

in {
ruby_2_4 = generic {
version = rubyVersion "2" "4" "7" "";
version = rubyVersion "2" "4" "9" "";
sha256 = {
src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd";
git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z";
src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr";
git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c";
};
};

ruby_2_5 = generic {
version = rubyVersion "2" "5" "6" "";
version = rubyVersion "2" "5" "7" "";
sha256 = {
src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx";
git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz";
src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
};
};

ruby_2_6 = generic {
version = rubyVersion "2" "6" "4" "";
version = rubyVersion "2" "6" "5" "";
sha256 = {
src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag";
git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf";
src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
};
};
}
16 changes: 3 additions & 13 deletions pkgs/development/interpreters/ruby/patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:

{
"2.3.8" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${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.7" = 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.6" = 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"
];
"2.6.4" = [
(fetchpatch {
url = "https://git.ruby-lang.org/ruby.git/patch/?id=ade1283ca276f7d589ffd3539fbc7b9817f682d5";
sha256 = "1vgrckmzz0ykyxgzyp8fcifa93xz2hvyfil79bw1gc3xx94wnnxd";
})
] ++ ops useRailsExpress [
"2.6.5" = 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"