Merge pull request #172954 from risicle/ris-mruby-3.1.0

mruby: 3.0.0 -> 3.1.0
This commit is contained in:
Mario Rodas 2022-05-13 21:22:27 -05:00 committed by GitHub
commit 2b04008ad9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,24 +1,16 @@
{ lib, stdenv, ruby, bison, rake, fetchFromGitHub, fetchpatch }: { lib, stdenv, ruby, bison, rake, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mruby"; pname = "mruby";
version = "3.0.0"; version = "3.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mruby"; owner = "mruby";
repo = "mruby"; repo = "mruby";
rev = version; rev = version;
sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c="; sha256 = "0gnzip7qfadnl0r1k8bpc9a6796sy503h77ggds02wrz7mpq32nf";
}; };
patches = [
(fetchpatch {
name = "CVE-2022-1212.patch";
url = "https://github.com/mruby/mruby/commit/3cf291f72224715942beaf8553e42ba8891ab3c6.patch";
sha256 = "1bl8wm6v7v18zgxqvm4kbn8g97a75phzrdah279xqw1qvplbd2w7";
})
];
nativeBuildInputs = [ ruby bison rake ]; nativeBuildInputs = [ ruby bison rake ];
# Necessary so it uses `gcc` instead of `ld` for linking. # Necessary so it uses `gcc` instead of `ld` for linking.