Merge remote-tracking branch 'origin/master' into staging-next

pkgs/development/interpreters/lua-5/default.nix

@@ -5,6 +5,12 @@ rec {
   lua5_4 = callPackage ./interpreter.nix {
     sourceVersion = { major = "5"; minor = "4"; patch = "2"; };
     hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi";
+
+    patches = if stdenv.isDarwin then [ ./5.4.darwin.patch ] else [
+      # build lua as a shared library as well, MIT-licensed from
+      # https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk
+      ./liblua.so.patch
+    ];
   };
 
   lua5_4_compat = lua5_4.override({