From 347c91efe7187f37a6ff948977c76e30d3084e7a Mon Sep 17 00:00:00 2001 From: 2kybe3 Date: Wed, 22 Apr 2026 06:48:15 +0200 Subject: [PATCH] usage: 3.2.0 -> 3.2.1 Changelog: https://github.com/jdx/usage/releases/tag/v3.2.1 Diff: https://github.com/jdx/usage/compare/v3.2.0...v3.2.1 --- pkgs/by-name/us/usage/package.nix | 10 +++------- pkgs/by-name/us/usage/use-bin-exe-env.patch | 17 ----------------- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 pkgs/by-name/us/usage/use-bin-exe-env.patch diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix index 58e6a1183629..76c6eecaf0e5 100644 --- a/pkgs/by-name/us/usage/package.nix +++ b/pkgs/by-name/us/usage/package.nix @@ -12,20 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "usage"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "jdx"; repo = "usage"; tag = "v${finalAttrs.version}"; - hash = "sha256-0yonwl/2BIkGUs0uOBP+Pjo93NvLVK4QQQj/K4C4NNY="; + hash = "sha256-L8OQ6GdHoxJROA/lczichG4nNx5UGKxInihel5AaFIc="; }; - cargoHash = "sha256-jxTN+La7Ye2okRZGAY6niIvvRf2E4vFFHd1nny7JJDo="; - - patches = [ - ./use-bin-exe-env.patch - ]; + cargoHash = "sha256-JauKSCp5Fk1shzXE2dy/joYamv7XW2rnIsu4hjIkBUA="; postPatch = '' substituteInPlace ./examples/*.sh \ diff --git a/pkgs/by-name/us/usage/use-bin-exe-env.patch b/pkgs/by-name/us/usage/use-bin-exe-env.patch deleted file mode 100644 index 832881faeb85..000000000000 --- a/pkgs/by-name/us/usage/use-bin-exe-env.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cli/tests/shell_completions_integration.rs b/cli/tests/shell_completions_integration.rs -index 815c44c..51b5dd9 100644 ---- a/cli/tests/shell_completions_integration.rs -+++ b/cli/tests/shell_completions_integration.rs -@@ -25,6 +25,13 @@ fn run_complete_word(usage_bin: &Path, shell: &str, spec_file: &Path, words: &[& - - /// Build the usage binary and return its path - fn build_usage_binary() -> PathBuf { -+ if let Some(usage_path) = std::env::var("CARGO_BIN_EXE_usage") -+ .ok() -+ .filter(|s| !s.is_empty()) -+ { -+ return PathBuf::from(usage_path); -+ } -+ - let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); - let workspace_root = manifest_dir.parent().unwrap();