From ab13e8340b1be2c34050424b58120f6b2ad1d346 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 24 Dec 2024 01:35:45 +0900
Subject: [PATCH 1/6] ox: 0.7.2 -> 0.7.5

Diff: https://github.com/curlpipe/ox/compare/0.7.2...0.7.5
---
 pkgs/by-name/ox/ox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 6e44376a8add9..78bd3e3817e14 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ox";
-  version = "0.7.2";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "curlpipe";
     repo = pname;
     rev = version;
-    hash = "sha256-yAToibHhvHAry7WVZ5uD84CbUTp06RyZ9J12/2deM1I=";
+    hash = "sha256-1RXvnYQ5nBVAraA43Tc62E3ppmZQL0BErxwGs80p7EU=";
   };
 
-  cargoHash = "sha256-YAy5vCxcHUL0wM9+Y3GDqV/V1utL3V05heT92/zQ/X8=";
+  cargoHash = "sha256-UxxPaa+iAOS2TI/+PMf48KpETZLZOhXD4ImsqupJAxw=";
 
   passthru = {
     tests.version = testers.testVersion {

From 665ceb9d68e5ab66fde2a48f9c172a81abbcc80c Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 24 Dec 2024 23:16:34 +0900
Subject: [PATCH 2/6] ox: 0.7.5 -> 0.7.6

Changelog: https://github.com/curlpipe/ox/releases/tag/0.7.6
---
 pkgs/by-name/ox/ox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 78bd3e3817e14..2d29233f50b67 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ox";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "curlpipe";
     repo = pname;
     rev = version;
-    hash = "sha256-1RXvnYQ5nBVAraA43Tc62E3ppmZQL0BErxwGs80p7EU=";
+    hash = "sha256-kTCdq3C0OUQS3tQRwEJ0+MTHZ8j2nnUARjdbmfH6ed4=";
   };
 
-  cargoHash = "sha256-UxxPaa+iAOS2TI/+PMf48KpETZLZOhXD4ImsqupJAxw=";
+  cargoHash = "sha256-GiKSkpXEngQtnGW8zjy2RWQOG1b/xQrYRSLHsndkooo=";
 
   passthru = {
     tests.version = testers.testVersion {

From aa98ffb557799118ac421c9e3525ba052fcea839 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 24 Dec 2024 23:35:54 +0900
Subject: [PATCH 3/6] ox: prefer versionCheckHook rather than
 testers.testVersion

https://github.com/NixOS/nixpkgs/blob/bd352cd67834c983d69adf4080d225dbe28f99ba/doc/stdenv/passthru.chapter.md?plain=1#L84
---
 pkgs/by-name/ox/ox/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 2d29233f50b67..e2e517346d199 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -3,9 +3,8 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
-  testers,
+  versionCheckHook,
   nix-update-script,
-  ox,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,11 +20,14 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-GiKSkpXEngQtnGW8zjy2RWQOG1b/xQrYRSLHsndkooo=";
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = ox;
-    };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+  versionCheckProgramArg = [ "--version" ];
 
+  passthru = {
     updateScript = nix-update-script { };
   };
 

From 065b7b61466ecf728e35b42ff45db62dbda4c340 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 26 Dec 2024 23:35:41 +0900
Subject: [PATCH 4/6] ox: add kachick as maintainer

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

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index e2e517346d199..0e94114f86c24 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -36,7 +36,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/curlpipe/ox";
     changelog = "https://github.com/curlpipe/ox/releases/tag/${version}";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ moni ];
+    maintainers = with maintainers; [
+      moni
+      kachick
+    ];
     mainProgram = "ox";
   };
 }

From f26fe7fc820b65b82da225a7071c741602f5d574 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 28 Dec 2024 15:25:36 +0900
Subject: [PATCH 5/6] ox: remove unused argument

Missing task in 96e67743abd9c95ddea96a4be83f151df334808a
---
 pkgs/by-name/ox/ox/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 0e94114f86c24..b54e9f2d0d39a 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
   versionCheckHook,

From 2bd5556f6342ce217fbecd2eadfb810a33cb5ddb Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 28 Dec 2024 15:27:32 +0900
Subject: [PATCH 6/6] ox: prefer tag rather than rev for fetchFromGitHub

Introduced in 7822cb3
---
 pkgs/by-name/ox/ox/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index b54e9f2d0d39a..06b57513a983c 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "curlpipe";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-kTCdq3C0OUQS3tQRwEJ0+MTHZ8j2nnUARjdbmfH6ed4=";
   };