summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2022-04-15 11:12:44 -0500
committerGitHub <noreply@github.com>2022-04-15 11:12:44 -0500
commitbc0fe654e684bdfa0a08b6448bcc2b61c03cf420 (patch)
treeb4c1ac2d7d58dc9164f79538b416efdc37ba4143 /pkgs/development/compilers
parentb5c4279c491ab9af4827210e6745c9175c41f7d8 (diff)
parentfbfa7ea82dd27b19d56c9f505ff5a013e749a630 (diff)
downloadnixpkgs-bc0fe654e684bdfa0a08b6448bcc2b61c03cf420.tar
nixpkgs-bc0fe654e684bdfa0a08b6448bcc2b61c03cf420.tar.gz
nixpkgs-bc0fe654e684bdfa0a08b6448bcc2b61c03cf420.tar.bz2
nixpkgs-bc0fe654e684bdfa0a08b6448bcc2b61c03cf420.tar.lz
nixpkgs-bc0fe654e684bdfa0a08b6448bcc2b61c03cf420.tar.xz
nixpkgs-bc0fe654e684bdfa0a08b6448bcc2b61c03cf420.tar.zst
nixpkgs-bc0fe654e684bdfa0a08b6448bcc2b61c03cf420.zip
Merge pull request #168720 from risicle/ris-mruby-CVE-2022-1212
mruby: add patch for CVE-2022-1212
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/mruby/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index 4d046cd7f84..6651df5a2f0 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/pkgs/development/compilers/mruby/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }:
+{ lib, stdenv, ruby, bison, rake, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "mruby";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256  = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2022-1212.patch";
+      url = "https://github.com/mruby/mruby/commit/3cf291f72224715942beaf8553e42ba8891ab3c6.patch";
+      sha256  = "1bl8wm6v7v18zgxqvm4kbn8g97a75phzrdah279xqw1qvplbd2w7";
+    })
+  ];
+
   nativeBuildInputs = [ ruby bison rake ];
 
   # Necessary so it uses `gcc` instead of `ld` for linking.