Skip to content

Comments

nixos/borgbackup: add extraArgs to wrapper script#415272

Merged
Scrumplex merged 1 commit intoNixOS:masterfrom
DoctorDalek1963:borg-wrapper-script-extra-args
Feb 21, 2026
Merged

nixos/borgbackup: add extraArgs to wrapper script#415272
Scrumplex merged 1 commit intoNixOS:masterfrom
DoctorDalek1963:borg-wrapper-script-extra-args

Conversation

@DoctorDalek1963
Copy link
Contributor

@DoctorDalek1963 DoctorDalek1963 commented Jun 9, 2025

This PR includes the extraArgs in the generated wrapper script for each borgbackup job. Some remotes require a specific version of borg to be passed with --remote-path or they just won't work. This can create a very confusing situation where the systemd service can connect and make backups, but the wrapper script says that borg isn't running on the server.

This PR means that --remote-path and other common flags like --verbose will be included in the wrapper script.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 9, 2025
@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 4, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 26, 2025
@DoctorDalek1963 DoctorDalek1963 force-pushed the borg-wrapper-script-extra-args branch from 7e11e7b to d8a5937 Compare August 6, 2025 22:36
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 6, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 5, 2025
@DoctorDalek1963 DoctorDalek1963 force-pushed the borg-wrapper-script-extra-args branch from d8a5937 to cb44226 Compare November 22, 2025 18:10
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 22, 2025
@Necoro Necoro requested review from Scrumplex and dotlambda January 10, 2026 14:44
@Necoro
Copy link
Member

Necoro commented Jan 10, 2026

@DoctorDalek1963 Automatic assigning of maintainers does not work for modules, please ping the maintainers (as given in the module) explicitly. I've done so for you now.

@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jan 10, 2026
Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Could you mention this in extraArgs' description. This is a significant difference from the other extra*Args options

@DoctorDalek1963 DoctorDalek1963 force-pushed the borg-wrapper-script-extra-args branch from cb44226 to f1fbeb1 Compare January 13, 2026 00:15
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex Scrumplex force-pushed the borg-wrapper-script-extra-args branch from f1fbeb1 to 719d621 Compare February 21, 2026 20:37
@Scrumplex
Copy link
Member

I have adjusted one of NixOS tests to make use of this new behavior. I'll merge this one checks pass.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 21, 2026
@Scrumplex Scrumplex added this pull request to the merge queue Feb 21, 2026
Merged via the queue into NixOS:master with commit 21ed056 Feb 21, 2026
28 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants