summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-05-26 00:47:38 +0300
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-05-26 09:19:41 +0300
commitc5f569a09aa6b87390be253151ded5d4cee4baab (patch)
tree2ccad8f02b0901cf985cd38264ef1012bd741d41
parent59b8a4fae6d95217690ba049f8f562c24a95b7c7 (diff)
downloadnixpkgs-c5f569a09aa6b87390be253151ded5d4cee4baab.tar
nixpkgs-c5f569a09aa6b87390be253151ded5d4cee4baab.tar.gz
nixpkgs-c5f569a09aa6b87390be253151ded5d4cee4baab.tar.bz2
nixpkgs-c5f569a09aa6b87390be253151ded5d4cee4baab.tar.lz
nixpkgs-c5f569a09aa6b87390be253151ded5d4cee4baab.tar.xz
nixpkgs-c5f569a09aa6b87390be253151ded5d4cee4baab.tar.zst
nixpkgs-c5f569a09aa6b87390be253151ded5d4cee4baab.zip
lua5_4: 5.4.4 -> 5.4.6
-rw-r--r--pkgs/development/interpreters/lua-5/default.nix23
1 files changed, 3 insertions, 20 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 139dd09e72a..f4c622515d7 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -77,29 +77,12 @@ in
 rec {
   lua5_4 = callPackage ./interpreter.nix {
     self = lua5_4;
-    version = "5.4.4";
-    hash = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E=";
+    version = "5.4.6";
+    hash = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg=";
     makeWrapper = makeBinaryWrapper;
     inherit passthruFun;
 
-    patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch
-      ++ [
-        (fetchpatch {
-          name = "CVE-2022-28805.patch";
-          url = "https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa.patch";
-          sha256 = "sha256-YTwoolSnRNJIHFPVijSO6ZDw35BG5oWYralZ8qOb9y8=";
-          stripLen = 1;
-          extraPrefix = "src/";
-          excludes = [ "src/testes/*" ];
-        })
-        (fetchpatch {
-          name = "CVE-2022-33099.patch";
-          url = "https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf.patch";
-          sha256 = "sha256-qj1Dq1ojVoknALSa67jhgH3G3Kk4GtJP6ROFElVF+D0=";
-          stripLen = 1;
-          extraPrefix = "src/";
-        })
-      ];
+    patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch;
   };
 
   lua5_4_compat = lua5_4.override({