JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ruby_2_6: patch use-after-free

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

This patch is on Ruby trunk, but hasn't been backported (yet?).
This commit is contained in:
Alyssa Ross 2019-09-07 13:02:40 +00:00
parent 3b5b9a73f5
commit ca96b55d3a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/ruby/default.nix
View File

@ -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
pkgs/development/interpreters/ruby/patchsets.nix
View File

@ -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"