From d31e7c52820c76402cacbfebb6634f51f0012a6c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 Jul 2023 03:44:39 -0500 Subject: [PATCH] rclone: 1.63.0 -> 1.63.1 (#244073) Diff: https://github.com/rclone/rclone/compare/v1.63.0...v1.63.1 Changelog: https://github.com/rclone/rclone/blob/v1.63.1/docs/content/changelog.md --- .../networking/sync/rclone/default.nix | 17 ++++------------- .../development/libraries/librclone/default.nix | 4 +++- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 4900b954695..f138523016e 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles, fetchpatch +{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles , makeWrapper , enableCmount ? true, fuse, macfuse-stubs , librclone @@ -6,25 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.63.0"; + version = "1.63.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ojP1Uf9iP6kOlzW8qsUx1SnMRxFZLsgkjFD4LVH0oTI="; + hash = "sha256-H//Y7BFBr3VXAoKZZgjSgU4aA+Af7tvFozhpoj14ba0="; }; - patches = [ - # Fix build on aarch64-darwin. Remove with the next release. - # https://github.com/rclone/rclone/pull/7099 - (fetchpatch { - url = "https://github.com/rclone/rclone/commit/fb5125ecee4ae1061ff933bb3b9b19243e022241.patch"; - hash = "sha256-3SzU9iiQM8zeL7VQhmq0G6e0km8WBRz4BSplRLE1vpM="; - }) - ]; - - vendorSha256 = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y="; + vendorHash = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y="; subPackages = [ "." ]; diff --git a/pkgs/development/libraries/librclone/default.nix b/pkgs/development/libraries/librclone/default.nix index 3c6a1f407f6..bb3053e19d5 100644 --- a/pkgs/development/libraries/librclone/default.nix +++ b/pkgs/development/libraries/librclone/default.nix @@ -8,7 +8,9 @@ let ext = stdenv.hostPlatform.extensions.sharedLibrary; in buildGoModule rec { pname = "librclone"; - inherit (rclone) version src patches vendorSha256; + inherit (rclone) version src vendorHash; + + patches = rclone.patches or [ ]; buildPhase = '' runHook preBuild