From 55995103d380e4dbe38f3d3809daf7bc854831d4 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 15 Apr 2024 13:07:28 +0400
Subject: [PATCH 1/2] =?UTF-8?q?gitui:=200.25.2=20=E2=86=92=200.26.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../version-management/gitui/default.nix      | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix
index 4b31c2e24853..f59249a9796d 100644
--- a/pkgs/applications/version-management/gitui/default.nix
+++ b/pkgs/applications/version-management/gitui/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitui";
-  version = "0.25.2";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "extrawurst";
-    repo = pname;
+    repo = "gitui";
     rev = "v${version}";
-    hash = "sha256-1sBuyY6lpxb/Vlpy6pi7YP69HZID6D97ZkVLbPEZ4Qw=";
+    hash = "sha256-JqxZbxjZrrdsXWhpYu0E9F18gMldtOLrAYd+uiY8IcQ=";
   };
 
-  cargoHash = "sha256-S8Oy5DII05430nkRJmMgZsb4fUIks2zliDea9RycH3E=";
+  cargoHash = "sha256-zEoNyIiHQT6HBNSe+H7pz229K4eD0WMhp3I/6zJQHuU=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -29,27 +29,32 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optional stdenv.isLinux xclip
     ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
 
+  postPatch = ''
+    # The cargo config overrides linkers for some targets, breaking the build
+    # on e.g. `aarch64-linux`. These overrides are not required in the Nix
+    # environment: delete them.
+    rm .cargo/config
+
+    # build script tries to get version information from git
+    rm build.rs
+    substituteInPlace Cargo.toml --replace-fail 'build = "build.rs"' ""
+  '';
+
+  GITUI_BUILD_NAME = version;
   # Needed to get openssl-sys to use pkg-config.
   OPENSSL_NO_VENDOR = 1;
 
-  # The cargo config overrides linkers for some targets, breaking the build
-  # on e.g. `aarch64-linux`. These overrides are not required in the Nix
-  # environment: delete them.
-  postPatch = "rm .cargo/config";
-
-
   # Getting app_config_path fails with a permission denied
   checkFlags = [
     "--skip=keys::key_config::tests::test_symbolic_links"
   ];
 
-
-  meta = with lib; {
+  meta = {
     description = "Blazing fast terminal-ui for Git written in Rust";
     homepage = "https://github.com/extrawurst/gitui";
     changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md";
     mainProgram = "gitui";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Br1ght0ne yanganto mfrw ];
   };
 }

From bd662930103650e0d569776e6e0566d510e43479 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 15 Apr 2024 13:11:27 +0400
Subject: [PATCH 2/2] gitui: migrate to by-name

---
 .../gitui/default.nix => by-name/gi/gitui/package.nix}   | 9 ++++++---
 pkgs/top-level/all-packages.nix                          | 4 ----
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{applications/version-management/gitui/default.nix => by-name/gi/gitui/package.nix} (90%)

diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/by-name/gi/gitui/package.nix
similarity index 90%
rename from pkgs/applications/version-management/gitui/default.nix
rename to pkgs/by-name/gi/gitui/package.nix
index f59249a9796d..edc03effa5fd 100644
--- a/pkgs/applications/version-management/gitui/default.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -6,8 +6,7 @@
 , openssl
 , pkg-config
 , xclip
-, AppKit
-, Security
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -27,7 +26,11 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ openssl ]
     ++ lib.optional stdenv.isLinux xclip
-    ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
+    ++ lib.optionals stdenv.isDarwin [
+         libiconv
+         darwin.apple_sdk.frameworks.Security
+         darwin.apple_sdk.frameworks.AppKit
+       ];
 
   postPatch = ''
     # The cargo config overrides linkers for some targets, breaking the build
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e81a4a5acb6..ab71ea43cb3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2528,10 +2528,6 @@ with pkgs;
 
   gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
 
-  gitui = callPackage ../applications/version-management/gitui {
-    inherit (darwin.apple_sdk.frameworks) Security AppKit;
-  };
-
   gitweb = callPackage ../applications/version-management/gitweb { };
 
   glab = callPackage ../applications/version-management/glab { };