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

Commits on Sep 7, 2019

  1. ruby_2_6: patch use-after-free 

    See https://bugs.ruby-lang.org/issues/16136.

This patch is on Ruby trunk, but hasn't been backported (yet?).
    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    ca96b55 View commit details
Showing with 10 additions and 5 deletions.
  1. +3 −3 pkgs/development/interpreters/ruby/default.nix
  2. +7 −2 pkgs/development/interpreters/ruby/patchsets.nix
6 changes: 3 additions & 3 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, buildPackages, lib
, fetchurl, fetchFromSavannah, fetchFromGitHub
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
, autoconf, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix
@@ -34,7 +34,7 @@ let
};
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
, fetchurl, fetchFromSavannah, fetchFromGitHub
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true
, rubygemsSupport ? true
, zlib, zlibSupport ? true
@@ -90,7 +90,7 @@ let

patches =
(import ./patchsets.nix {
inherit patchSet useRailsExpress ops;
inherit patchSet useRailsExpress ops fetchpatch;
patchLevel = ver.patchLevel;
}).${ver.majMinTiny};

9 changes: 7 additions & 2 deletions pkgs/development/interpreters/ruby/patchsets.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ patchSet, useRailsExpress, ops, patchLevel }:
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:

{
"2.3.8" = ops useRailsExpress [
@@ -16,7 +16,12 @@
"${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" = ops useRailsExpress [
"2.6.4" = [
(fetchpatch {
url = "https://git.ruby-lang.org/ruby.git/patch/?id=ade1283ca276f7d589ffd3539fbc7b9817f682d5";
sha256 = "1vgrckmzz0ykyxgzyp8fcifa93xz2hvyfil79bw1gc3xx94wnnxd";
})
] ++ 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"