Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d32e2e30639e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c0daa19e2d6
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 24, 2018

  1. nixos/borgbackup: make extraArgs a shell variable 

    in line with the other extra*Args variables
    @globin
    Robert Schütz authored and globin committed May 24, 2018
    Copy the full SHA
    3c0daa1 View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 nixos/modules/services/backup/borgbackup.nix
14 changes: 7 additions & 7 deletions nixos/modules/services/backup/borgbackup.nix
View file
Original file line number Diff line number Diff line change
@@ -35,26 +35,26 @@ let
${cfg.preHook}
'' + optionalString cfg.doInit ''
# Run borg init if the repo doesn't exist yet
if ! borg list ${cfg.extraArgs} > /dev/null; then
borg init ${cfg.extraArgs} \
if ! borg list $extraArgs > /dev/null; then
borg init $extraArgs \
--encryption ${cfg.encryption.mode} \
$extraInitArgs
${cfg.postInit}
fi
'' + ''
borg create ${cfg.extraArgs} \
borg create $extraArgs \
--compression ${cfg.compression} \
--exclude-from ${mkExcludeFile cfg} \
$extraCreateArgs \
"::$archiveName$archiveSuffix" \
${escapeShellArgs cfg.paths}
'' + optionalString cfg.appendFailedSuffix ''
borg rename ${cfg.extraArgs} \
borg rename $extraArgs \
"::$archiveName$archiveSuffix" "$archiveName"
'' + ''
${cfg.postCreate}
'' + optionalString (cfg.prune.keep != { }) ''
borg prune ${cfg.extraArgs} \
borg prune $extraArgs \
${mkKeepArgs cfg} \
--prefix ${escapeShellArg cfg.prune.prefix} \
$extraPruneArgs
@@ -93,7 +93,7 @@ let
};
environment = {
BORG_REPO = cfg.repo;
inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs;
inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs;
} // (mkPassEnv cfg) // cfg.environment;
inherit (cfg) startAt;
};
@@ -463,7 +463,7 @@ in {
service has. Handle with care.
'';
default = "";
example = "--remote-path=borg1";
example = "--remote-path=/path/to/borg";
};

extraInitArgs = mkOption {