From 784f9f572a8de8e5b4f16e604a36b2ed21f24deb Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 25 Dec 2024 00:54:40 +0900 Subject: [PATCH 1/4] gurk-rs: prefer versionCheckHook rather than testers.testVersion https://github.com/NixOS/nixpkgs/blob/bd352cd67834c983d69adf4080d225dbe28f99ba/doc/stdenv/passthru.chapter.md?plain=1#L84 --- .../networking/instant-messengers/gurk-rs/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 2959feb587b2..58bf7dca9ad5 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -8,7 +8,7 @@ pkgsBuildHost, openssl, pkg-config, - testers, + versionCheckHook, gurk-rs, }: @@ -49,9 +49,12 @@ rustPlatform.buildRustPackage rec { useNextest = true; - passthru.tests.version = testers.testVersion { - package = gurk-rs; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; meta = with lib; { description = "Signal Messenger client for terminal"; From 2af9866791b897ef4ccd2692a14489d75cc7e9be Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 25 Dec 2024 00:56:26 +0900 Subject: [PATCH 2/4] gurk-rs: add nix-update-script --- .../networking/instant-messengers/gurk-rs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 58bf7dca9ad5..26c351da1f5a 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -9,6 +9,7 @@ openssl, pkg-config, versionCheckHook, + nix-update-script, gurk-rs, }: @@ -56,6 +57,8 @@ rustPlatform.buildRustPackage rec { versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; versionCheckProgramArg = [ "--version" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Signal Messenger client for terminal"; mainProgram = "gurk"; From c7a5d52b3e417ab67a0c863bcbb44eb188ba8560 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 25 Dec 2024 01:00:24 +0900 Subject: [PATCH 3/4] gurk-rs: 0.5.2 -> 0.6.0 Changelog: https://github.com/boxdot/gurk-rs/blob/v0.6.0/CHANGELOG.md?plain=1#L3-L28 --- .../networking/instant-messengers/gurk-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 26c351da1f5a..22f5345db851 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "boxdot"; repo = "gurk-rs"; rev = "refs/tags/v${version}"; - hash = "sha256-ZVpI60pZZCLRnKdC80P8f63gE0+Vi1lelhyFPAhpHyU="; + hash = "sha256-FPbEtk2A7qs/85VsmfV1uPsVZ7V5WKhMKeWrzUt5L4w="; }; postPatch = '' @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; - cargoHash = "sha256-jTZ2wJPXj3nU7GVTfne64eSra+JuKhNryCtRZMKOE44="; + cargoHash = "sha256-yLZKat6NNZkbyTpAVpOvDAbbNajh4Vaebc7fmK0I3Mc="; nativeBuildInputs = [ protobuf From c8acc7dce0ac63be8b758316e473f844dfe833cd Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 25 Dec 2024 01:02:38 +0900 Subject: [PATCH 4/4] gurk-rs: prefer tag rather than rev for fetchFromGitHub introduced in 7822cb34f86bcdd0b9f31f2955062216857a6757 --- .../networking/instant-messengers/gurk-rs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 22f5345db851..ef466182c9bd 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "boxdot"; repo = "gurk-rs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-FPbEtk2A7qs/85VsmfV1uPsVZ7V5WKhMKeWrzUt5L4w="; };