From 604210ed34edcab2f7c1d604e75889c6438b3d2d Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 3 Jun 2023 10:19:31 -0400
Subject: [PATCH] delta: 0.16.4 -> 0.16.5, add figsoda as a maintainer

Diff: https://github.com/dandavison/delta/compare/0.16.4...0.16.5

Changelog: https://github.com/dandavison/delta/releases/tag/0.16.5
---
 .../version-management/delta/default.nix      | 41 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix
index 2711196ca318..79c511ec2c8c 100644
--- a/pkgs/applications/version-management/delta/default.nix
+++ b/pkgs/applications/version-management/delta/default.nix
@@ -1,38 +1,47 @@
-{ stdenv
-, lib
-, fetchFromGitHub
+{ lib
 , rustPlatform
+, fetchFromGitHub
 , installShellFiles
-, DiskArbitration
-, Foundation
-, libiconv
-, Security
+, pkg-config
+, oniguruma
+, stdenv
+, darwin
 , git
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "delta";
-  version = "0.16.4";
+  version = "0.16.5";
 
   src = fetchFromGitHub {
     owner = "dandavison";
     repo = pname;
     rev = version;
-    hash = "sha256-lIOJPDnSwyPVhmBUPCiWtpNNxXGRKVruidBKIF9tFvo=";
+    hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM=";
   };
 
-  cargoHash = "sha256-7+SwJ64PJvBi0YOeYcfqsN2f5ehj/t7XhniWd4jWJnM=";
+  cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
 
-  buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ];
+  buildInputs = [
+    oniguruma
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk_11_0.frameworks.Foundation
+  ];
 
   nativeCheckInputs = [ git ];
 
+  env = {
+    RUSTONIG_SYSTEM_LIBONIG = true;
+  };
+
   postInstall = ''
-    installShellCompletion --bash --name delta.bash etc/completion/completion.bash
-    installShellCompletion --zsh --name _delta etc/completion/completion.zsh
-    installShellCompletion --fish --name delta.fish etc/completion/completion.fish
+    installShellCompletion --cmd delta \
+      etc/completion/completion.{bash,fish,zsh}
   '';
 
   checkFlags = lib.optionals stdenv.isDarwin [
@@ -44,6 +53,6 @@ rustPlatform.buildRustPackage rec {
     description = "A syntax-highlighting pager for git";
     changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ];
+    maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 192662252060..71bc1a49dbd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1881,9 +1881,7 @@ with pkgs;
 
   darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
 
-  delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta {
-    inherit (darwin.apple_sdk_11_0.frameworks) DiskArbitration Foundation Security;
-  };
+  delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { };
 
   diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };