diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 00:01:24 +0000 |
| commit | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (patch) | |
| tree | e6488db2914676e85250ee12633c8ddf45b7f67b /pkgs/tools/backup | |
| parent | c2d4ce2808616d558b6cef8a6d270c4930b06c18 (diff) | |
| parent | 688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff) | |
| download | nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.gz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.bz2 nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.lz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.xz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.zst nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/btrbk/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/backup/lvmsync/default.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 4b4dadd4faf..12308b24045 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric ]; - inherit version; }; } diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index c289c3938ab..e36e20902df 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { |