pika-backup: 0.3.5 -> 0.4.0
https://gitlab.gnome.org/World/pika-backup/-/blob/v0.4.0/CHANGELOG.md
This commit is contained in:
parent
3fa11ba9f4
commit
977df9de2e
|
@ -1,13 +1,22 @@
|
||||||
diff --git a/src/borg/utils.rs b/src/borg/utils.rs
|
diff --git a/src/borg/process.rs b/src/borg/process.rs
|
||||||
index 4e30913..30d7d6f 100644
|
index 63ea0ee..e3535e0 100644
|
||||||
--- a/src/borg/utils.rs
|
--- a/src/borg/process.rs
|
||||||
+++ b/src/borg/utils.rs
|
+++ b/src/borg/process.rs
|
||||||
@@ -223,7 +223,7 @@ impl BorgCall {
|
@@ -203,7 +203,7 @@ impl BorgCall {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn cmd(&self) -> Command {
|
pub fn cmd(&self) -> Result<process::Command> {
|
||||||
- let mut cmd = Command::new("borg");
|
- let mut cmd = process::Command::new("borg");
|
||||||
+ let mut cmd = 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> {
|
||||||
|
- let mut cmd = async_process::Command::new("borg");
|
||||||
|
+ let mut cmd = async_process::Command::new("@borg@");
|
||||||
|
|
||||||
|
cmd.envs([self.set_password()?]);
|
||||||
|
|
||||||
cmd.args(self.args())
|
|
||||||
.stderr(Stdio::piped())
|
|
||||||
|
|
|
@ -5,35 +5,34 @@
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, substituteAll
|
, substituteAll
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
|
, itstool
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, python3
|
, python3
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, borgbackup
|
, borgbackup
|
||||||
, dbus
|
, gtk4
|
||||||
, gdk-pixbuf
|
, libadwaita
|
||||||
, glib
|
, libsecret
|
||||||
, gtk3
|
|
||||||
, libhandy
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pika-backup";
|
pname = "pika-backup";
|
||||||
version = "0.3.5";
|
version = "0.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
owner = "World";
|
owner = "World";
|
||||||
repo = "pika-backup";
|
repo = "pika-backup";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-8jT3n+bTNjhm64AMS24Ju+San75ytfqFXloH/TOgO1g=";
|
hash = "sha256-vQ0hlwsrY0WOUc/ppleE+kKRGHPt/ScEChXrkukln3U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
sha256 = "198bs4z7l22sh8ck7v46s45mj8zpfbg03n1xzc6pnafdd8hf3q15";
|
hash = "sha256-IKUh5gkXTpmMToDaec+CpCIQqJjwJM2ZrmGQhZeTDsg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -41,12 +40,10 @@ stdenv.mkDerivation rec {
|
||||||
src = ./borg-path.patch;
|
src = ./borg-path.patch;
|
||||||
borg = "${borgbackup}/bin/borg";
|
borg = "${borgbackup}/bin/borg";
|
||||||
})
|
})
|
||||||
# Fix build with meson 0.61, can be removed on next release.
|
|
||||||
# https://gitlab.gnome.org/World/pika-backup/-/issues/156
|
|
||||||
# https://github.com/mesonbuild/meson/issues/9441
|
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://gitlab.gnome.org/World/pika-backup/-/commit/54be149c88fd69fb9e74b7362fe7182863237869.patch";
|
name = "use-gtk4-update-icon-cache.patch";
|
||||||
sha256 = "sha256-Tffxo5hlf/gSkp1GfyL4eHthX49tuTq6B+S53N8oA2M=";
|
url = "https://gitlab.gnome.org/World/pika-backup/-/merge_requests/64.patch";
|
||||||
|
hash = "sha256-AttGQGWealvTIvPwBl5M6FiC4Al/UD4/XckUAxM38SE=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -56,11 +53,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
|
itstool
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
] ++ (with rustPlatform; [
|
] ++ (with rustPlatform; [
|
||||||
cargoSetupHook
|
cargoSetupHook
|
||||||
rust.cargo
|
rust.cargo
|
||||||
|
@ -68,16 +66,14 @@ stdenv.mkDerivation rec {
|
||||||
]);
|
]);
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
dbus
|
gtk4
|
||||||
gdk-pixbuf
|
libadwaita
|
||||||
glib
|
libsecret
|
||||||
gtk3
|
|
||||||
libhandy
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Simple backups based on borg";
|
description = "Simple backups based on borg";
|
||||||
homepage = "https://wiki.gnome.org/Apps/PikaBackup";
|
homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup";
|
||||||
changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
|
changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ dotlambda ];
|
maintainers = with maintainers; [ dotlambda ];
|
||||||
|
|
Loading…
Reference in a new issue