summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-05-02 13:47:36 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-05-02 14:00:45 +0200
commitd7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca (patch)
tree198c0320f06302d9a4aeb491304cdd98847267a0 /pkgs/servers
parent9ad1aaae5337bb55df9c64636d2c8b7f97381dd1 (diff)
downloadnixlib-d7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca.tar
nixlib-d7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca.tar.gz
nixlib-d7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca.tar.bz2
nixlib-d7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca.tar.lz
nixlib-d7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca.tar.xz
nixlib-d7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca.tar.zst
nixlib-d7501b986a5d0f5a6ebe020d5f8bbb7c9d65b1ca.zip
luajit: 2.1.0-beta2 -> 2.1.0-beta3
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/dns/knot-resolver/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index f388302f4bf5..c60e7232b79e 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which
+{ stdenv, fetchurl, fetchpatch, pkgconfig, utillinux, hexdump, which
 , knot-dns, luajit, libuv, lmdb
 , cmocka, systemd, hiredis, libmemcached
 , gnutls, nettle
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "31e1b8899c5592433e5265a8e9685126fc5aeff3bd6b10884154b2e34b786f3c";
   };
 
+  patches = [(fetchpatch {
+    name = "luajit-2.1.0-beta3.diff";
+    url = https://gitlab.labs.nic.cz/knot/resolver/merge_requests/289.diff;
+    sha256 = "1cgfi715qhmvb31ri2wr6cacsjvb1dqavdmnnl1074y25zalxfax";
+  })];
+
   outputs = [ "out" "dev" ];
 
   configurePhase = ":";