From 6dd3bfff7af4ab458a262d0950eb012b9acfd31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 18 Aug 2021 23:17:58 +0200
Subject: [PATCH] luaformatter: combine with duplicate package lua-format,
 remove submodule usage

---
 .../tools/luaformatter/default.nix            | 30 +++++++++--------
 .../tools/luaformatter}/fix-lib-paths.patch   |  0
 pkgs/tools/misc/lua-format/default.nix        | 32 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 16 insertions(+), 48 deletions(-)
 rename pkgs/{tools/misc/lua-format => development/tools/luaformatter}/fix-lib-paths.patch (100%)
 delete mode 100644 pkgs/tools/misc/lua-format/default.nix

diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix
index 2745e7e01b13..5fb82b0fb4c9 100644
--- a/pkgs/development/tools/luaformatter/default.nix
+++ b/pkgs/development/tools/luaformatter/default.nix
@@ -1,31 +1,33 @@
-{ cmake, fetchFromGitHub, lib, stdenv }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }:
 
 stdenv.mkDerivation rec {
   pname = "luaformatter";
   version = "1.3.6";
 
   src = fetchFromGitHub {
-    owner = "koihik";
-    repo = "luaformatter";
+    owner = "Koihik";
+    repo = "LuaFormatter";
     rev = version;
-    sha256 = "0440kdab5i0vhlk71sbprdrhg362al8jqpy7w2vdhcz1fpi5cm0b";
-    fetchSubmodules = true;
+    sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-lib-paths.patch;
+      antlr4RuntimeCpp = antlr4.runtime.cpp.dev;
+      inherit libargs catch2 libyamlcpp;
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-    cp lua-format $out/bin
-    runHook postInstall
-  '';
+  buildInputs = [ antlr4.runtime.cpp libyamlcpp ];
 
   meta = with lib; {
-    description = "Code formatter for lua";
-    homepage = "https://github.com/koihik/luaformatter";
+    description = "Code formatter for Lua";
+    homepage = "https://github.com/Koihik/LuaFormatter";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with maintainers; [ figsoda SuperSandro2000 ];
     mainProgram = "lua-format";
   };
 }
diff --git a/pkgs/tools/misc/lua-format/fix-lib-paths.patch b/pkgs/development/tools/luaformatter/fix-lib-paths.patch
similarity index 100%
rename from pkgs/tools/misc/lua-format/fix-lib-paths.patch
rename to pkgs/development/tools/luaformatter/fix-lib-paths.patch
diff --git a/pkgs/tools/misc/lua-format/default.nix b/pkgs/tools/misc/lua-format/default.nix
deleted file mode 100644
index 9aad25ce7299..000000000000
--- a/pkgs/tools/misc/lua-format/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }:
-
-stdenv.mkDerivation rec {
-  pname = "lua-format";
-  version = "1.3.6";
-
-  src = fetchFromGitHub {
-    owner = "Koihik";
-    repo = "LuaFormatter";
-    rev = version;
-    sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./fix-lib-paths.patch;
-      antlr4RuntimeCpp = antlr4.runtime.cpp.dev;
-      inherit libargs catch2 libyamlcpp;
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ antlr4.runtime.cpp libyamlcpp ];
-
-  meta = with lib; {
-    description = "Code formatter for Lua";
-    homepage = "https://github.com/Koihik/LuaFormatter";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ SuperSandro2000 ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02eecacd68ce..cf341e1bf551 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -971,8 +971,6 @@ with pkgs;
 
   logseq = callPackage ../applications/misc/logseq { };
 
-  lua-format = callPackage ../tools/misc/lua-format { };
-
   lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
 
   microcom = callPackage ../applications/terminal-emulators/microcom { };