From 3f79093ce0b442284cd0b7e45e2519033bd40af0 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 13 Jan 2025 02:21:15 +0900 Subject: [PATCH 1/3] rclone: add versionCheckHook --- pkgs/applications/networking/sync/rclone/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index e821d7d3b1ff..f5acde79e2a5 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, buildPackages, installShellFiles, + versionCheckHook, makeWrapper, enableCmount ? true, fuse, @@ -83,6 +84,13 @@ buildGoModule rec { --suffix PATH : "${lib.makeBinPath [ fuse3 ]}" ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "version" ]; + passthru.tests = { inherit librclone; }; From 5fc87eddf13380276f3050d3493017a9cb3de7ea Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 13 Jan 2025 02:23:03 +0900 Subject: [PATCH 2/3] rclone: add nix-update-script --- pkgs/applications/networking/sync/rclone/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index f5acde79e2a5..502f6341b4e1 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -12,6 +12,7 @@ fuse3, macfuse-stubs, librclone, + nix-update-script, }: buildGoModule rec { @@ -91,8 +92,11 @@ buildGoModule rec { versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; versionCheckProgramArg = [ "version" ]; - passthru.tests = { - inherit librclone; + passthru = { + tests = { + inherit librclone; + }; + updateScript = nix-update-script { }; }; meta = with lib; { From 5d49db93c6d855ac3df887af6a564c378e25be57 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 13 Jan 2025 02:26:17 +0900 Subject: [PATCH 3/3] rclone: 1.68.2 -> 1.69.0 Diff: https://github.com/rclone/rclone/compare/v1.68.2...v1.69.0 Changelog: https://github.com/rclone/rclone/blob/v1.69.0/docs/content/changelog.md This patch is generated with following command ```bash nix-shell ./maintainers/scripts/update.nix --argstr package rclone ``` --- pkgs/applications/networking/sync/rclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 502f6341b4e1..d6c51fcb91a8 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { pname = "rclone"; - version = "1.68.2"; + version = "1.69.0"; outputs = [ "out" @@ -28,10 +28,10 @@ buildGoModule rec { owner = "rclone"; repo = "rclone"; tag = "v${version}"; - hash = "sha256-3Al58jg+pYP46VbpIRbYBhMOG6m7OQaC0pxKawX12E8="; + hash = "sha256-cJNlRubL6RFaYIr0WrDONqgmz75vNIIDHMqBpf5So5Q="; }; - vendorHash = "sha256-PCj/f/oeLEAC/yFmR5dSyoLb45Z1fPLAASBaM251+Mc="; + vendorHash = "sha256-+tugs0vNuIVUQPU3a3mF3e+zfi1IQuqjDm52D85o8NE="; subPackages = [ "." ];