summaryrefslogtreecommitdiffstats
path: root/pkgs/development/interpreters/luajit
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-08-31 16:27:00 +0200
committerVladimír Čunát <v@cunat.cz>2020-08-31 16:31:12 +0200
commit0e58393738890de9679aff9c60e211dab990a7e7 (patch)
treef3af3f9872d413f5456799f5763579ecd5daf302 /pkgs/development/interpreters/luajit
parent9379f9350d4faea9c6f3862297d58f27b2168f93 (diff)
luajit*: update to address CVE-2020-24372
/cc roundup issues: #96821, #96828. The diff upstream is fairly small, so let me trust Mike Pall on this. Both versions get a pair of commits that seem to address the CVE https://github.com/LuaJIT/LuaJIT/issues/603 and 2.1 additionally gets one other small commit.
Diffstat (limited to 'pkgs/development/interpreters/luajit')
-rw-r--r--pkgs/development/interpreters/luajit/2.0.nix6
-rw-r--r--pkgs/development/interpreters/luajit/2.1.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix
index e96a7c604c70..afb5dd9c5b64 100644
--- a/pkgs/development/interpreters/luajit/2.0.nix
+++ b/pkgs/development/interpreters/luajit/2.0.nix
@@ -1,10 +1,10 @@
{ self, callPackage, lib }:
callPackage ./default.nix {
inherit self;
- version = "2.0.5-2020-08-05";
- rev = "2211f6f";
+ version = "2.0.5-2020-08-09";
+ rev = "e296f56";
isStable = true;
- sha256 = "01adxmknq2xyb3w9sn8ilnar8181h7ksd9i80yrsbwzix5lwkn6m";
+ sha256 = "0g4wvpmmrxj8ir6yi86gg93khy8ri7x4w091jihpxsmn670da21f";
extraMeta = { # this isn't precise but it at least stops the useless Hydra build
platforms = with lib; filter (p: p != "aarch64-linux")
(platforms.linux ++ platforms.darwin);
diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix
index f08bbd0e9724..cb0320c7c7cf 100644
--- a/pkgs/development/interpreters/luajit/2.1.nix
+++ b/pkgs/development/interpreters/luajit/2.1.nix
@@ -1,8 +1,8 @@
{ self, callPackage }:
callPackage ./default.nix {
inherit self;
- version = "2.1.0-2020-08-05";
- rev = "10ddae7";
+ version = "2.1.0-2020-08-27";
+ rev = "ff1e72a";
isStable = false;
- sha256 = "1lmjs0gz9vgbhh5f45jvvibpj7f3sz81r8cz4maln9yhc67f2zmk";
+ sha256 = "0rlh5y48jbxnamr3a5i3szzh7y9ycvq052rw6m82gdhrb1jlamdz";
}