From 52fe6941f3d6c135564b2e0c82edf59c53035458 Mon Sep 17 00:00:00 2001 From: KangaZero Date: Thu, 17 Sep 2026 14:46:23 +0900 Subject: [PATCH 1/2] octorus: 0.3.5 -> 0.7.2 Removed unused `installShellFiles` Added check dependencies and hooks Addded `versionCheckHook` Added `makeWrapper` for needed runtime dependencies `gh` and `gitMinimal` Fixed `meta.mainProgram` name --- pkgs/by-name/oc/octorus/package.nix | 34 ++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/oc/octorus/package.nix b/pkgs/by-name/oc/octorus/package.nix index 3357a2f74baf..81d409cad6cd 100644 --- a/pkgs/by-name/oc/octorus/package.nix +++ b/pkgs/by-name/oc/octorus/package.nix @@ -2,23 +2,45 @@ lib, fetchFromGitHub, rustPlatform, - installShellFiles, + writableTmpDirAsHomeHook, + gitMinimal, + gh, + makeWrapper, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "octorus"; - version = "0.3.5"; + version = "0.7.2"; src = fetchFromGitHub { owner = "ushironoko"; repo = "octorus"; tag = "v${finalAttrs.version}"; - hash = "sha256-xVbLh1fe+59KxcZOtCoSAh6O+VdhAyBSGCPP3UZLidA="; + hash = "sha256-qwWCH/Yu9idxaOMNMlSM/RTJgSkpFSyV8VcmnK7DTqI="; }; - cargoHash = "sha256-mOHjNQWeEcoBS4OhPj5RRja+b1PCPAeOM49t7OUtx1s="; + cargoHash = "sha256-wFPeBzbR+/n4gd0y15ToN2XRfsxsCu9if+XT6UTa1GI="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ makeWrapper ]; + + nativeCheckInputs = [ + gitMinimal + writableTmpDirAsHomeHook + ]; + + postInstall = '' + wrapProgram $out/bin/or \ + --prefix PATH : ${ + lib.makeBinPath [ + gh + gitMinimal + ] + } + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; meta = { description = "TUI PR review tool for GitHub"; @@ -28,6 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ matthiasbeyer ]; - mainProgram = "octorus"; + mainProgram = "or"; }; }) From 912c7ab0b05c65ab4c020db20d75622d5234b37c Mon Sep 17 00:00:00 2001 From: KangaZero Date: Thu, 17 Sep 2026 14:52:03 +0900 Subject: [PATCH 2/2] octorus: add kangazero as maintainer --- pkgs/by-name/oc/octorus/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/oc/octorus/package.nix b/pkgs/by-name/oc/octorus/package.nix index 81d409cad6cd..1780b6b2cfe6 100644 --- a/pkgs/by-name/oc/octorus/package.nix +++ b/pkgs/by-name/oc/octorus/package.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer + kangazero ]; mainProgram = "or"; };