From ac04a3ca253baa9558639ab9a03f44a000a0816c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 1 Nov 2024 13:02:26 -0400
Subject: [PATCH 1/5] riffdiff: migrate to by-name

---
 .../riffdiff/default.nix => by-name/ri/riffdiff/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/text/riffdiff/default.nix => by-name/ri/riffdiff/package.nix} (100%)

diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/by-name/ri/riffdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/riffdiff/default.nix
rename to pkgs/by-name/ri/riffdiff/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1f7c2b7d27e..34bef17b5252 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18186,8 +18186,6 @@ with pkgs;
 
   riff = callPackage ../development/tools/misc/riff { };
 
-  riffdiff = callPackage ../tools/text/riffdiff {};
-
   rman = callPackage ../development/tools/misc/rman { };
 
   rnginline = with python3Packages; toPythonApplication rnginline;

From 49872f3ca66e2570881cb5881a767eeeae489b73 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 1 Nov 2024 13:02:46 -0400
Subject: [PATCH 2/5] riffdiff: format with nixfmt

---
 pkgs/by-name/ri/riffdiff/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 481a75e1bd12..3e5474d229d5 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -1,4 +1,8 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";

From 67dee65a8724f2b76d9c37c6761ded9ce96d7203 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 1 Nov 2024 13:03:44 -0400
Subject: [PATCH 3/5] riffdiff: use best practices

---
 pkgs/by-name/ri/riffdiff/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 3e5474d229d5..939705da864b 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -2,6 +2,9 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
+  riffdiff,
+  testers,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -11,17 +14,23 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ=";
   };
 
   cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg=";
 
-  meta = with lib; {
+  passthru = {
+    tests.version = testers.testVersion { package = riffdiff; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Diff filter highlighting which line parts have changed";
     homepage = "https://github.com/walles/riff";
-    license = licenses.mit;
-    maintainers = with maintainers; [ johnpyp ];
+    changelog = "https://github.com/walles/riff/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ johnpyp ];
     mainProgram = "riff";
   };
 }

From a0266126ce657b5db22c2c6e749e4efff6d8c7be Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 1 Nov 2024 13:04:04 -0400
Subject: [PATCH 4/5] riffdiff: add getchoo to maintainers

---
 pkgs/by-name/ri/riffdiff/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 939705da864b..d015f56ff5b7 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -30,7 +30,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/walles/riff";
     changelog = "https://github.com/walles/riff/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ johnpyp ];
+    maintainers = with lib.maintainers; [
+      johnpyp
+      getchoo
+    ];
     mainProgram = "riff";
   };
 }

From 4071a3089eed66ace39c750331016c9b850cf6a8 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 1 Nov 2024 13:08:24 -0400
Subject: [PATCH 5/5] riffdiff: 3.3.3 -> 3.3.6

Diff: https://github.com/walles/riff/compare/refs/tags/3.3.3...3.3.6

Changelog: https://github.com/walles/riff/releases/tag/3.3.6
---
 pkgs/by-name/ri/riffdiff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index d015f56ff5b7..eecc8e3e57b0 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.3.3";
+  version = "3.3.6";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     rev = "refs/tags/${version}";
-    hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ=";
+    hash = "sha256-qXFSO2VIPaGnB+5Wp/u0FTcKnpcMLxW6uNykKL681lU=";
   };
 
-  cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg=";
+  cargoHash = "sha256-i6/wa2/ogyLwLBdIXqTYdJX9+SFf+p7Zm2j2Q3mje6w=";
 
   passthru = {
     tests.version = testers.testVersion { package = riffdiff; };