From 5a0b1947edb103a6cc9b5e027bdc59129b569f36 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 13 Oct 2020 17:50:37 -0400 Subject: [PATCH] restic: 0.9.6 -> 0.10.0 Co-authored-by: Martin Polden Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com> --- pkgs/tools/backup/restic/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 33cac4ad229b..6839b47a5ff2 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper , nixosTests, rclone }: -buildGoPackage rec { +buildGoModule rec { pname = "restic"; - version = "0.9.6"; - - goPackagePath = "github.com/restic/restic"; + version = "0.10.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7"; + sha256 = "0nrh52cjymzcf093sqqa3kfw2nimnx6qwn8aw0wsci2v2r84yzzx"; }; + vendorSha256 = "1pfixq3mbfn12gyablc4g0j8r00md3887q0l8xgxy76z0d8w924s"; + subPackages = [ "cmd/restic" ]; nativeBuildInputs = [ installShellFiles makeWrapper ]; passthru.tests.restic = nixosTests.restic; + postPatch = '' + rm cmd/restic/integration_fuse_test.go + ''; + postInstall = '' wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin' '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''