From 1a358ae84330cab20403c8edd673d1d16ef0d127 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 8 Dec 2025 19:43:31 -0500 Subject: [PATCH 1/2] {nh,nh-unwrapped}: fix search See: https://github.com/nix-community/nh/issues/501#issuecomment-3620877120 See also: https://github.com/nix-community/nh/commit/df9fdd6ac3f8bf5ea6f241ec5bb44d1a36e70272 --- pkgs/by-name/nh/nh-unwrapped/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index 862d32fd7960..3eb80209f879 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -4,12 +4,13 @@ rustPlatform, installShellFiles, fetchFromGitHub, + fetchpatch, nix-update-script, buildPackages, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nh-unwrapped"; - version = "4.2.0"; + version = "4.2.0"; # Did you remove the patch below (and this comment)? src = fetchFromGitHub { owner = "nix-community"; @@ -18,6 +19,13 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-6n5SVO8zsdVTD691lri7ZcO4zpqYFU8GIvjI6dbxkA8="; }; + patches = [ + (fetchpatch { + url = "https://github.com/nix-community/nh/commit/8bf323483166797a204579a43ed8810113eb128c.patch"; + hash = "sha256-hg0LgDPjiPWR+1DRzqORv6QPlrds7ys4PTDXFw6PUoI="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ From 17a6b18eb6db41cd9e03d86cdafb87077b401aa2 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 8 Dec 2025 19:49:09 -0500 Subject: [PATCH 2/2] {nh,nh-unwrapped,nixos/nh}: add mdaniels5757 as co-maintainer --- nixos/modules/programs/nh.nix | 1 + pkgs/by-name/nh/nh-unwrapped/package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/modules/programs/nh.nix b/nixos/modules/programs/nh.nix index f50e7a9dcea9..d40c445b2f6b 100644 --- a/nixos/modules/programs/nh.nix +++ b/nixos/modules/programs/nh.nix @@ -10,6 +10,7 @@ in { meta.maintainers = with lib.maintainers; [ NotAShelf + mdaniels5757 viperML ]; diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index 3eb80209f879..66715a6d6151 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -64,6 +64,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "nh"; maintainers = with lib.maintainers; [ NotAShelf + mdaniels5757 viperML ]; };