-
-
Notifications
You must be signed in to change notification settings - Fork 19.7k
pika-backup: init at 0.2.1 #115573
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
pika-backup: init at 0.2.1 #115573
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/src/borg/utils.rs b/src/borg/utils.rs | ||
| index 4e30913..30d7d6f 100644 | ||
| --- a/src/borg/utils.rs | ||
| +++ b/src/borg/utils.rs | ||
| @@ -223,7 +223,7 @@ impl BorgCall { | ||
| } | ||
|
|
||
| pub fn cmd(&self) -> Command { | ||
| - let mut cmd = Command::new("borg"); | ||
| + let mut cmd = Command::new("@borg@"); | ||
|
|
||
| cmd.args(self.args()) | ||
| .stderr(Stdio::piped()) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| { lib | ||
| , stdenv | ||
| , fetchFromGitLab | ||
| , rustPlatform | ||
| , substituteAll | ||
| , desktop-file-utils | ||
| , meson | ||
| , ninja | ||
| , pkg-config | ||
| , python3 | ||
| , wrapGAppsHook | ||
| , borgbackup | ||
| , dbus | ||
| , gdk-pixbuf | ||
| , glib | ||
| , gtk3 | ||
| , libhandy | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "pika-backup"; | ||
| version = "0.2.1"; | ||
|
|
||
| src = fetchFromGitLab { | ||
| domain = "gitlab.gnome.org"; | ||
| owner = "World"; | ||
| repo = "pika-backup"; | ||
| rev = "v${version}"; | ||
| sha256 = "0fm6vwpw0pa98v2yn8p3818rrlv9lk3pmgnal1b2kh52im5ll7m8"; | ||
| }; | ||
|
|
||
| cargoDeps = rustPlatform.fetchCargoTarball { | ||
| inherit src; | ||
| name = "${pname}-${version}"; | ||
| sha256 = "1f5s6a0wjrs2spsicirhbvb5xlz9iflwsaqchij9k02hfcsr308y"; | ||
| }; | ||
|
|
||
| patches = [ | ||
| (substituteAll { | ||
| src = ./borg-path.patch; | ||
| borg = "${borgbackup}/bin/borg"; | ||
| }) | ||
| ]; | ||
|
|
||
| postPatch = '' | ||
| patchShebangs build-aux | ||
| ''; | ||
|
|
||
| nativeBuildInputs = [ | ||
| desktop-file-utils | ||
| meson | ||
| ninja | ||
| pkg-config | ||
| python3 | ||
| wrapGAppsHook | ||
| ] ++ (with rustPlatform; [ | ||
| cargoSetupHook | ||
| rust.cargo | ||
| rust.rustc | ||
| ]); | ||
|
|
||
| buildInputs = [ | ||
| dbus | ||
| gdk-pixbuf | ||
| glib | ||
| gtk3 | ||
| libhandy | ||
| ]; | ||
|
|
||
| meta = with lib; { | ||
| description = "Simple backups based on borg"; | ||
| homepage = "https://wiki.gnome.org/Apps/PikaBackup"; | ||
| changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md"; | ||
| license = licenses.gpl3Plus; | ||
| maintainers = with maintainers; [ dotlambda ]; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can probably be replaced with
substituteInPlace src/borg/utils.rs b/src/borg/utils.rs --replace 'Command::new("borg");' "Command::new(${borgbackup}/bin/borg);"There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It can. But that makes it less obvious when things break. That's why I prefer patches.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Substitute in place logs a warning when it can't find the pattern which nixpkgs hammering catches. Patches for simple things should be avoided because they clutter the repository and blow up the file count and size.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the other hand, they are much easier to manage – you can simply apply them to the source code using
git applyand then re-generate them usinggit diff. Manual substitute is more laborious and thus more prone to mistakes.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there are arguments in favor of both approaches. So, I think we should favor what the package maintainer prefers. They have to maintain the patches/substitutions after all.