From 5ccec8487cb22473c5c162d7940f3210758defa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Wed, 6 May 2026 15:06:46 -0400 Subject: [PATCH 1/2] ouch: add philocalyst as a maintainer --- pkgs/by-name/ou/ouch/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 13f58078827c..1daca5a40e7e 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -73,6 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ psibi krovuxdev + philocalyst ]; mainProgram = "ouch"; }; From ed2c352793b2897b176e6b1dd6ae18b9550b6477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Wed, 6 May 2026 15:07:10 -0400 Subject: [PATCH 2/2] ouch: 0.6.1 -> 0.7.1 new cmake input due to sys dep --- pkgs/by-name/ou/ouch/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 1daca5a40e7e..67c683c7fe99 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, + cmake, pkg-config, bzip2, bzip3, @@ -18,18 +19,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ouch"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "ouch-org"; repo = "ouch"; rev = finalAttrs.version; - hash = "sha256-vNeOJOyQsjDUzScA1a/W+SI1Z67HTLiHjwWZZpr1Paw="; + hash = "sha256-XT2CWYZiY5UskTmHKl9EVWBIJoOiR9rOCQUoN8U9o40="; }; - cargoHash = "sha256-mMoYJ3dLpb1Y3Ocdyxg1brE7xYeZBbtUg0J/2HTK0hE="; + cargoHash = "sha256-ckqzptKk6aituDMTA5JGzMWoXiVuOoK3N29KNUJnmgw="; nativeBuildInputs = [ + cmake installShellFiles pkg-config rustPlatform.bindgenHook @@ -51,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "use_zlib" "use_zstd_thin" - # "bzip3" will be optional in the next version + "bzip3" "zstd/pkg-config" ] ++ lib.optionals enableUnfree [ @@ -60,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' installManPage artifacts/*.1 - installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch + installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch --nushell artifacts/ouch.nu ''; env.OUCH_ARTIFACTS_FOLDER = "artifacts"; @@ -75,6 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { krovuxdev philocalyst ]; + platforms = lib.platforms.all; mainProgram = "ouch"; }; })