From 98a9103299dcf0d78eb51439c869d62eeae2ea17 Mon Sep 17 00:00:00 2001
From: rogarb <rogarb@rgarbage.fr>
Date: Mon, 24 Apr 2023 16:54:23 +0200
Subject: [PATCH 1/2] maintainers: add rogarb

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ee231ce5ae36..851cc6d9c072 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13351,6 +13351,12 @@
     githubId = 710906;
     name = "Roel van Dijk";
   };
+  rogarb = {
+    email = "rogarb@rgarbage.fr";
+    github = "rogarb";
+    githubId = 69053978;
+    name = "rogarb";
+  };
   roman = {
     email = "open-source@roman-gonzalez.info";
     github = "roman";

From f701114548ba22bdf03f465dcc25649d8bd0f5c4 Mon Sep 17 00:00:00 2001
From: rogarb <rogarb@rgarbage.fr>
Date: Mon, 24 Apr 2023 17:04:33 +0200
Subject: [PATCH 2/2] hexdiff: init at unstable-2018-01-24

A command line tool to display differences in binary files using a
hexadecimal formatting.

https://github.com/ahroach/hexdiff
---
 pkgs/tools/misc/hexdiff/default.nix | 39 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/misc/hexdiff/default.nix

diff --git a/pkgs/tools/misc/hexdiff/default.nix b/pkgs/tools/misc/hexdiff/default.nix
new file mode 100644
index 000000000000..8205cfdd0ab4
--- /dev/null
+++ b/pkgs/tools/misc/hexdiff/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "hexdiff";
+  version = "unstable-2018-01-24";
+
+  src = fetchFromGitHub {
+    owner = "ahroach";
+    repo = "hexdiff";
+    rev = "3e96f27e65167c619ede35ab04232163dc273e69";
+    sha256 = "sha256-G6Qi7e4o+0ahcslJ8UfJrdoc8NNkY+nl6kyDlkJCo9I=";
+  };
+
+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    $CC -o hexdiff hexdiff.c
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D hexdiff  -t $out/bin/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/ahroach/hexdiff";
+    description = "A terminal application for differencing two binary files, with color-coded output";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ rogarb ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20f1e7b4aaae..5395aa5c4fcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1554,6 +1554,8 @@ with pkgs;
 
   headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };
 
+  hexdiff = callPackage ../tools/misc/hexdiff { };
+
   httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
 
   inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;