diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/backup/restic')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix | 16 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix | 19 |
2 files changed, 17 insertions, 18 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix index 33cac4ad229b..3317ada541a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/infra/libkookie/nixpkgs/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.11.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7"; + sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf"; }; + vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh"; + 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) '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix index 45a4df74b15d..9f2a52d64dcd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/rest-server.nix @@ -1,25 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "restic-rest-server"; - version = "0.9.7"; - - goPackagePath = "github.com/restic/rest-server"; + version = "0.10.0"; src = fetchFromGitHub { owner = "restic"; repo = "rest-server"; rev = "v${version}"; - sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj"; + sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7"; }; - buildPhase = '' - cd go/src/${goPackagePath} - go run build.go - ''; + vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg"; - installPhase = '' - install -Dt $out/bin rest-server + preCheck = '' + substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin" ''; meta = with lib; { |