lad: case-insensitivity

pkgs/gf-pgf/default.nix

@@ -8,5 +8,4 @@ stdenv.mkDerivation {
   inherit (gf-core) version meta;
   src = "${gf-core.src}/src/runtime/c";
   nativeBuildInputs = [autoreconfHook ];
-  broken = true;
 }

pkgs/lad/case-insensitivity.patch

@@ -0,0 +1,26 @@
+diff --git a/5.1/assembler.lua b/5.1/assembler.lua
+index fb89b18df2..e5f0b2753b 100644
+--- a/5.1/assembler.lua
++++ b/5.1/assembler.lua
+@@ -100,7 +100,7 @@
+   label <- <name> ":"
+   string <- '"' ('\\' / '\"' / !'"' .)* '"'
+   instruction <- ( <s> ( {<label>} / <number>)? <s> <ln>? <s> {<op>} ( <s> {<param>} )+ <s> ( %nl )+ ) -> {}
+-  op <- [A-Z]+
++  op <- [A-Za-z]+
+   param <- <register> / <number> / <name> / <string>
+   register <- ( "R[" <number> "]" )
+   s <- ( !%nl %s )*
+@@ -310,10 +310,10 @@
+   local b = 3
+   local c = 4
+   if check_label(table[1]) == nil then
+-    op = table[1]
++    op = string.upper (table[1])
+   else
+     set_label(table[1], parsed, n)
+-    op = table[2]
++    op = string.upper (table[2])
+     a = 3
+     b = 4
+     c = 5

pkgs/lad/default.nix

@@ -0,0 +1,51 @@
+{ lua5_2
+, lua5_1
+, stdenv
+, makeWrapper
+, fetchFromGitHub
+, lib
+, wantLad5_1 ? true
+, wantLad5_2 ? true
+, wantCaseInsensitivity ? false
+}:
+
+let
+  our-lua52 = lua5_2.withPackages (ps: with ps; [
+    lpeg
+  ]);
+  our-lua51 = lua5_1.withPackages (ps: with ps; [
+    lpeg
+  ]);
+in stdenv.mkDerivation {
+  pname = "lad";
+  version = "5d2eafb";
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+  src = fetchFromGitHub {
+    owner = "andremm";
+    repo = "lad";
+    rev = "5d2eafb8790d7a1030aca0dbb75201073aacd1d9";
+    hash = "sha256-oIKayAUuRDqiHmAD37A5RYcMTh1RtpNl0jLcc5h3718=";
+  };
+  LUA51 = lib.getExe our-lua51;
+  LUA52 = lib.getExe our-lua52;
+  patches = lib.optional wantCaseInsensitivity ./case-insensitivity.patch;
+  installPhase = ''
+    mkdir -p $out/bin $out/opt/{5.1,5.2}
+    cp 5.1/*.lua $out/opt/5.1/
+    cp 5.2/*.lua $out/opt/5.2/
+    ${lib.optionalString wantLad5_1 ''
+    makeWrapper $LUA51 $out/bin/luaa-5.1 \
+      --add-flags $out/opt/5.1/assembler.lua
+    makeWrapper $LUA51 $out/bin/luad-5.1 \
+      --add-flags $out/opt/5.1/disassembler.lua
+    ''}
+    ${lib.optionalString wantLad5_2 ''
+    makeWrapper $LUA52 $out/bin/luaa-5.2 \
+      --add-flags $out/opt/5.2/luaa.lua
+    makeWrapper $LUA52 $out/bin/luad-5.2 \
+      --add-flags $out/opt/5.2/luad.lua
+    ''}
+  '';
+}

pkgs/ljtools/default.nix

@@ -1,42 +0,0 @@
-{ qt5
-  , breakpointHook
-  , luajit
-  , stdenv
-  , fetchFromGitHub
-}:
-
-let
-  GuiTools-src = fetchFromGitHub {
-    owner = "rochus-keller";
-    repo = "GuiTools";
-    rev = "df36aa5c823d0c81259ae70b7c6f194c88017d6f";
-    hash = "sha256-RmpVkUjcAkde755QQwfWvC4sOxDLx2itmqw1T1DTOlE=";
-    name = "GuiTools";
-  };
-  LjTools-src = fetchFromGitHub {
-    owner = "rochus-keller";
-    repo = "LjTools";
-    name = "LjTools";
-    hash = "sha256-PWh1ZP5+hNXvDpJTaWtegHvcuBkdrZ6oA+bIkEikVHk=";
-    rev = "412675e2cc12bec1e00fd7a2ec52270f388d225b";
-  };
-  luajit-src = luajit.src.override { name = "LuaJIT"; };
-in stdenv.mkDerivation {
-  pname = "ljtools";
-  version = "0.1.0";
-  srcs = [
-    GuiTools-src
-    LjTools-src
-    luajit-src
-  ];
-  sourceRoot = "LjTools";
-  buildInputs = [
-    qt5.qtbase
-  ];
-  nativeBuildInputs = [
-    qt5.qtbase
-    breakpointHook
-    qt5.wrapQtAppsHook
-    qt5.qmake
-  ];
-}