diff options
author | Robin Gloster <mail@glob.in> | 2019-08-21 14:25:13 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2019-08-21 14:25:13 +0200 |
commit | f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d (patch) | |
tree | 43c003d74f5de4cf4f42207cfd933d1077f8f04a /pkgs/tools/backup | |
parent | 9135412b63fcdb8d5cf1be659b657628f754d9c5 (diff) | |
parent | 609d408970362522c3b85ea5f903321247ed502f (diff) |
Merge remote-tracking branch 'upstream/master' into openssl-1.1
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r-- | pkgs/tools/backup/bacula/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/bdsync/default.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/backup/borg/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/btrbk/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/backup/pyznap/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/backup/s3ql/default.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/backup/wal-e/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/zfs-replicate/default.nix | 42 |
8 files changed, 75 insertions, 38 deletions
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 02b37784eaa9..e5e26169b745 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" - ]; + ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; installFlags = [ "logdir=\${out}/logdir" diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index 2fd67765aaf3..be8746932caf 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchFromGitHub, openssl, coreutils, which }: +{ stdenv, fetchFromGitHub +, openssl +, pandoc +, which +}: stdenv.mkDerivation rec { - - name = "${pname}-${version}"; pname = "bdsync"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "TargetHolding"; repo = pname; rev = "v${version}"; - sha256 = "144hlbk3k29l7sja6piwhd2jsnzzsak13fcjbahd6m8yimxyb2nf"; + sha256 = "11grdyc6fgw93jvj965awsycqw5qbzsdys7n8farqnmya8qv8gac"; }; + nativeBuildInputs = [ pandoc which ]; + buildInputs = [ openssl ]; + postPatch = '' patchShebangs ./tests.sh patchShebangs ./tests/ ''; - buildInputs = [ openssl coreutils which ]; - doCheck = true; - checkPhase = '' - make test - ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - cp bdsync $out/bin/ - cp bdsync.1 $out/share/man/man1/ + install -Dm755 bdsync -t $out/bin/ + install -Dm644 bdsync.1 -t $out/share/man/man1/ ''; meta = with stdenv.lib; { @@ -39,5 +37,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; - } diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index beb3db5e78b3..593056f403ed 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec { homepage = https://www.borgbackup.org; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ flokli dotlambda ]; + maintainers = with maintainers; [ flokli dotlambda globin ]; }; } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dfa28203dbf2..91809af415a3 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, utillinux, asciidoc, makeWrapper }: +, utillinux, asciidoc, asciidoctor, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.28.0"; + version = "0.28.3"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf"; + sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz"; }; - nativeBuildInputs = [ asciidoc makeWrapper ]; + nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; buildInputs = with perlPackages; [ perl DateCalc ]; diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix index e37327c429d5..eb714b64a973 100644 --- a/pkgs/tools/backup/pyznap/default.nix +++ b/pkgs/tools/backup/pyznap/default.nix @@ -1,21 +1,17 @@ { lib , buildPythonApplication , fetchPypi -, paramiko -, configparser }: buildPythonApplication rec { pname = "pyznap"; - version = "1.1.2"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "9ac0da5d7f6461d1d6f128362786e297144b415f9e3a2f1835642ab3dda82d55"; + sha256 = "0pnngr4zdxkf6b570ikzvkrm3a8fr47w6crjaw7ln094qkniywvj"; }; - propagatedBuildInputs = [ configparser paramiko ]; - # tests aren't included in the PyPI packages doCheck = false; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 1bd8ebfd44b6..b71f032bd7ae 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchurl, python3Packages, sqlite, which }: +{ stdenv, fetchFromGitHub, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "s3ql"; - version = "2.26"; + version = "3.2"; - src = fetchurl { - url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2"; - sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "release-${version}"; + sha256 = "01ky0jc1s3w9dry5siz9b69jf2maiargz99axgxvyihap0d7qs52"; }; - buildInputs = [ which ]; # tests will fail without which + checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); propagatedBuildInputs = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong llfuse - cython pytest pytest-catchlog + cython pytest pytest-catchlog google_auth google-auth-oauthlib ]; preBuild = '' - # https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851 ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace ''; checkPhase = '' + # Removing integration tests + rm tests/t{4,5,6}_* pytest tests ''; meta = with stdenv.lib; { description = "A full-featured file system for online data storage"; - homepage = https://bitbucket.org/nikratio/s3ql; + homepage = "https://github.com/s3ql/s3ql/"; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem ]; platforms = platforms.linux; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 3b66ac1b491f..42a3f51ee609 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; homepage = https://github.com/wal-e/wal-e; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = []; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix new file mode 100644 index 000000000000..83fa76b0800e --- /dev/null +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -0,0 +1,42 @@ +{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest +, pytestcov, pytestrunner, stdenv, stringcase +}: + +buildPythonApplication rec { + pname = "zfs-replicate"; + version = "1.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0386xc6rw6bhzw2a08g90afb3snqhm1ikx65bjfh22ha69fwmga8"; + }; + + checkInputs = [ + hypothesis + mypy + pytest + pytestcov + ]; + + buildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + click + stringcase + ]; + + doCheck = true; + + checkPhase = '' + pytest --doctest-modules + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/alunduil/zfs-replicate; + description = "ZFS Snapshot Replication"; + license = licenses.bsd2; + maintainers = with maintainers; [ alunduil ]; + }; +} |