From 06c5a2133c70f0f1f2d94c1f4456d0d4e462e80c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 3 Jul 2025 16:48:26 +0900 Subject: [PATCH 1/5] noseyparker: add versionCheckHook --- pkgs/by-name/no/noseyparker/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index 69b5249e3975..f7a417f3f8dc 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -8,6 +8,7 @@ vectorscan, openssl, pkg-config, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -52,6 +53,13 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/noseyparker-cli"; + versionCheckProgramArg = "--version"; + meta = { description = "Find secrets and sensitive information in textual data"; mainProgram = "noseyparker"; From baa32aab1dc31c80b8c1ac5043182aa2b394f9e8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 3 Jul 2025 16:51:39 +0900 Subject: [PATCH 2/5] noseyparker: add shell completions --- pkgs/by-name/no/noseyparker/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index f7a417f3f8dc..a692a0b6da1d 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, boost, @@ -8,6 +9,7 @@ vectorscan, openssl, pkg-config, + installShellFiles, versionCheckHook, }: @@ -44,6 +46,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config + installShellFiles ]; buildInputs = [ boost @@ -53,6 +56,13 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd noseyparker-cli \ + --bash <("$out/bin/noseyparker-cli" generate shell-completions --shell bash) \ + --zsh <("$out/bin/noseyparker-cli" generate shell-completions --shell zsh) \ + --fish <("$out/bin/noseyparker-cli" generate shell-completions --shell fish) + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; From d661131db4ab4a43bedd8c41b9e24d4a2287cb6c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 3 Jul 2025 17:13:13 +0900 Subject: [PATCH 3/5] noseyparker: add manpages --- pkgs/by-name/no/noseyparker/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index a692a0b6da1d..c5791af82ea1 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -57,6 +57,10 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mkdir -p manpages + "$out/bin/noseyparker-cli" generate manpages + installManPage manpages/* + installShellCompletion --cmd noseyparker-cli \ --bash <("$out/bin/noseyparker-cli" generate shell-completions --shell bash) \ --zsh <("$out/bin/noseyparker-cli" generate shell-completions --shell zsh) \ From 584a674ef4f16857349e1c333dc535bea69f6486 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 3 Jul 2025 19:48:19 +0900 Subject: [PATCH 4/5] noseyparker: skip a flaky test --- pkgs/by-name/no/noseyparker/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index c5791af82ea1..2fa88343145a 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -41,6 +41,9 @@ rustPlatform.buildRustPackage rec { "--skip=github::github_repos_list_user_jsonl_format" "--skip=github::github_repos_list_user_repo_filter" "--skip=scan::appmaker::scan_workflow_from_git_url" + + # This caused a flaky result. See https://github.com/NixOS/nixpkgs/pull/422012#issuecomment-3031728181 + "--skip=scan::git_url::git_binary_missing" ]; nativeBuildInputs = [ From 168457230fdc9c7c11ccf7e774c62d8b95ac183d Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 3 Jul 2025 20:56:27 +0900 Subject: [PATCH 5/5] noseyparker: skip external Git-dependent tests to prevent instability --- pkgs/by-name/no/noseyparker/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index 2fa88343145a..e830e452b015 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, boost, cmake, - git, vectorscan, openssl, pkg-config, @@ -27,10 +26,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-hVBHIm/12WU6g45QMxxuGk41B0kwThk7A84fOxArvno="; - nativeCheckInputs = [ - git - ]; - checkFlags = [ # These tests expect access to network to clone and use GitHub API "--skip=github::github_repos_list_multiple_user_dedupe_jsonl_format" @@ -44,6 +39,11 @@ rustPlatform.buildRustPackage rec { # This caused a flaky result. See https://github.com/NixOS/nixpkgs/pull/422012#issuecomment-3031728181 "--skip=scan::git_url::git_binary_missing" + + # Also skips all tests which depend on external git command to prevent unstable tests similar to git_binary_missing + # See https://github.com/NixOS/nixpkgs/pull/422012#discussion_r2182551619 + "--skip=scan::git_url::https_nonexistent" + "--skip=scan::basic::scan_git_emptyrepo" ]; nativeBuildInputs = [