From cb8300fbae92c8fe802f979b66bcb341e33c6f56 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 30 Jan 2025 23:27:49 +0900 Subject: [PATCH 1/2] bfg-repo-cleaner: prefer versionCheckHook rather than testers.testVersion https://github.com/NixOS/nixpkgs/blob/bd352cd67834c983d69adf4080d225dbe28f99ba/doc/stdenv/passthru.chapter.md?plain=1#L84 --- pkgs/by-name/bf/bfg-repo-cleaner/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index d2044dd34c78..f7b73362d43e 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -4,8 +4,7 @@ fetchurl, jre, makeWrapper, - testers, - bfg-repo-cleaner, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -31,9 +30,12 @@ stdenv.mkDerivation rec { makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" ''; - passthru.tests.version = testers.testVersion { - package = bfg-repo-cleaner; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; meta = with lib; { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; From 82d95f18fdcbde3640402db949125c0ba1a430a6 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 30 Jan 2025 23:31:26 +0900 Subject: [PATCH 2/2] bfg-repo-cleaner: 1.14.0 -> 1.15.0 Diff: https://github.com/rtyley/bfg-repo-cleaner/compare/v1.14.0...v1.15.0 --- pkgs/by-name/bf/bfg-repo-cleaner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index f7b73362d43e..bf6c2ce7eafc 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bfg-repo-cleaner"; - version = "1.14.0"; + version = "1.15.0"; jarName = "bfg-${version}.jar"; src = fetchurl { url = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; - hash = "sha256-GnXpOQVB9LVdnAElazYbgVweCiY+L7PQcrVcKRHq0Lc="; + hash = "sha256-3+KIWtwpFjeQk/AqgBgSAFNoVsmph78hxJLkUq3v73o="; }; nativeBuildInputs = [ makeWrapper ];