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: 6be178c50145
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fea63944fd4b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 11, 2020

  1. nixos/znapzend: Use generic mbuffer path 

    The configured mbuffer path will be called on both the source and target
system. If you use pkgs.mbuffer from the source host and the target host
does not have this exact derivation, you will get a broken pipe when
sending snapshots. This is the case when transferring to a non-NixOS
system or to a host with a different mbuffer version.
    @SlothOfAnarchy
    SlothOfAnarchy committed May 11, 2020
    Copy the full SHA
    c46b26b View commit details

Commits on May 12, 2020

  1. Merge pull request #87280 from helsinki-systems/znapzend-mbuffer-path

    @infinisil
    infinisil authored May 12, 2020
    Copy the full SHA
    fea6394 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 nixos/modules/services/backup/znapzend.nix
3 changes: 2 additions & 1 deletion nixos/modules/services/backup/znapzend.nix
View file
Original file line number Diff line number Diff line change
@@ -268,7 +268,8 @@ let

mkSrcAttrs = srcCfg: with srcCfg; {
enabled = onOff enable;
mbuffer = with mbuffer; if enable then "${pkgs.mbuffer}/bin/mbuffer"
# mbuffer is not referenced by its full path to accomodate non-NixOS systems or differing mbuffer versions between source and target
mbuffer = with mbuffer; if enable then "mbuffer"
+ optionalString (port != null) ":${toString port}" else "off";
mbuffer_size = mbuffer.size;
post_znap_cmd = nullOff postsnap;