diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
| commit | 5effa4e0f98b317fe4607b1a6548811017c3325d (patch) | |
| tree | d62ab19ccca3b0c6409595074b637eeb3d4371dc /pkgs/tools/backup | |
| parent | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (diff) | |
| parent | 8f58e00226e3192994050b12aa9ed119be0220f3 (diff) | |
| download | nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.gz nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.bz2 nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.lz nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.xz nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.zst nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.zip | |
Merge branch 'master' into staging-next
Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/backup/duply/default.nix | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 9d82777da81..5cf675a9af1 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation rec { description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 2ce6f7e92e7..0ccc964c3e6 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "duply-${version}"; - version = "2.1"; + version = "2.2"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.1.x/duply_${version}.tgz"; - sha256 = "0i5j7h7h6ssrwhll0sfhymisshg54kx7j45zcqffzjxa0ylvzlm8"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_${version}.tgz"; + sha256 = "1bd7ivswxmxg64n0fnwgz6bkgckhdhz2qnnlkqqx4ccdxx15krbr"; }; buildInputs = [ txt2man makeWrapper ]; |