diff options
author | Robert Schütz <nix@dotlambda.de> | 2024-03-05 03:41:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-05 03:41:10 +0000 |
commit | 1b4d05bf7564f3e0dbe09625395f9e8ff7107fc2 (patch) | |
tree | dcbf0bc8196de4636d18f15c21e1b928440f4a8e /pkgs/applications | |
parent | 0775ae58dc2666916559dc12c6aa820ee707b98d (diff) | |
parent | ce1761fa5845c85aeeb665a392c60daadda20d48 (diff) |
Merge pull request #293078 from dotlambda/pika-backup-0.7.0
pika-backup: 0.6.2 -> 0.7.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/backup/pika-backup/borg-path.patch | 17 | ||||
-rw-r--r-- | pkgs/applications/backup/pika-backup/default.nix | 8 |
2 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/applications/backup/pika-backup/borg-path.patch index faa4b76cec7be..dc5d417d14800 100644 --- a/pkgs/applications/backup/pika-backup/borg-path.patch +++ b/pkgs/applications/backup/pika-backup/borg-path.patch @@ -1,22 +1,13 @@ diff --git a/src/borg/process.rs b/src/borg/process.rs -index 63ea0ee..e3535e0 100644 +index 9af8da7..85bcbf8 100644 --- a/src/borg/process.rs +++ b/src/borg/process.rs -@@ -203,7 +203,7 @@ impl BorgCall { +@@ -278,7 +278,7 @@ impl BorgCall { } - pub fn cmd(&self) -> Result<process::Command> { -- let mut cmd = process::Command::new("borg"); -+ let mut cmd = process::Command::new("@borg@"); - - cmd.envs([self.set_password()?]); - -@@ -221,7 +221,7 @@ impl BorgCall { - } - - pub fn cmd_async(&self) -> Result<async_process::Command> { + pub(super) fn command(&self) -> Result<(async_process::Command, UnixStream)> { - let mut cmd = async_process::Command::new("borg"); + let mut cmd = async_process::Command::new("@borg@"); - cmd.envs([self.set_password()?]); + let unix_stream = self.stream_password(&mut cmd)?; diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index dd4049daa1391..8c225b43ccf58 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -21,26 +21,26 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-RTeRlfRmA/fXBcdzP41mbs88ArKlbU49AA0lnW3xRlg="; + hash = "sha256-WeFc/4TEIxw6uzLroJX1D/rEA419sghkjBt1nsPv2Ho="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2B0N/Yq9A4LqKh8EKWmzNzTelwGE3Y9FL9IAqAgFSV8="; + hash = "sha256-fgPgUZxye9YUyX9/+hTye3cUypgRAegZMUTKfPxVH4s="; }; patches = [ (substituteAll { src = ./borg-path.patch; - borg = "${borgbackup}/bin/borg"; + borg = lib.getExe borgbackup; }) ]; |