From b47e7bf35c9d363687a7830777bee9261793b434 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Sun, 31 Dec 2023 11:50:00 +0100
Subject: [PATCH] fac: move to by-name

---
 .../default.nix => by-name/fa/fac/package.nix}  | 17 +++++++++++------
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename pkgs/{development/tools/fac/default.nix => by-name/fa/fac/package.nix} (73%)

diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/by-name/fa/fac/package.nix
similarity index 73%
rename from pkgs/development/tools/fac/default.nix
rename to pkgs/by-name/fa/fac/package.nix
index 36dce35b995f..e7b09e73b355 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/by-name/fa/fac/package.nix
@@ -1,13 +1,14 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
-, makeWrapper
+, makeBinaryWrapper
+, installShellFiles
 , git
 }:
 
 buildGoModule rec {
   pname = "fac";
-  version = "unstable-2023-12-29";
+  version = "2.0.0-unstable-2023-12-29";
 
   src = fetchFromGitHub {
     owner = "mkchoi212";
@@ -18,21 +19,25 @@ buildGoModule rec {
 
   vendorHash = "sha256-bmGRVTjleAFS5GGf2i/zN8k3SBtaEc3RbKSVZyF6eN4=";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    installShellFiles
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/fac \
-      --prefix PATH : ${git}/bin
+      --prefix PATH : ${lib.makeBinPath [ git ]}
 
     # Install man page, not installed by default
-    install -D assets/doc/fac.1 $out/share/man/man1/fac.1
+    installManPage assets/doc/fac.1
   '';
 
   meta = {
+    changelog = "https://github.com/mkchoi212/fac/releases/tag/v${version}";
     description = "CUI for fixing git conflicts";
     homepage = "https://github.com/mkchoi212/fac";
-    changelog = "https://github.com/mkchoi212/fac/releases/tag/v${version}";
     license = lib.licenses.mit;
+    mainProgram = "fac";
     maintainers = with lib.maintainers; [ dtzWill ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 056bada2b343..f0bf65dbfb16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5349,8 +5349,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
   };
 
-  fac = callPackage ../development/tools/fac { };
-
   facedetect = callPackage ../tools/graphics/facedetect { };
 
   facter = callPackage ../tools/system/facter { };