diff options
author | Peter Simons <simons@cryp.to> | 2013-09-01 21:32:40 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-09-01 21:32:40 +0200 |
commit | fe273e896562404c22233fdfa7ca3ee70ea58727 (patch) | |
tree | 386e9cb02dfa2c7a1c750e1256c8369a64ed8ca7 /pkgs/tools/backup/bup | |
parent | 43f965f50eea50932b79ecb1e8199646f384d84c (diff) |
Revert "backup tools bup, storeBackup: implement sanity check" on behalf of Marc.
This reverts commit c823bc37d6b50dcd4e183963922da829a193f0d7. The newly added test case needs more work to succeed on Hydra. See <http://permalink.gmane.org/gmane.linux.distributions.nixos/11382> for further details.
Diffstat (limited to 'pkgs/tools/backup/bup')
-rw-r--r-- | pkgs/tools/backup/bup/default.nix | 45 |
1 files changed, 4 insertions, 41 deletions
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 63356e5f7c1bd..e683df5a7fe19 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper -, diffutils, writeTextFile, rsync , par2cmdline, par2Support ? false }: -# keep in mind you cannot prune older revisions yet! (2013-06) - assert par2Support -> par2cmdline != null; with stdenv.lib; @@ -13,14 +10,12 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/bup/bup.git"; - rev = "98a8e2ebb775386cb7e66b1953df46cdbd4b4bd3"; - sha256 = "ab01c70f0caf993c0c05ec3a1008b5940b433bf2f7bd4e9b995d85e81958c1b7"; + rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; + sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; }; buildInputs = [ python git ]; - nativeBuildInputs = [ pandoc perl makeWrapper rsync ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ pandoc perl makeWrapper ]; patchPhase = '' substituteInPlace Makefile --replace "-Werror" "" @@ -29,12 +24,6 @@ stdenv.mkDerivation { substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" done substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" - for t in t/*.sh t/configure-sampledata t/compare-trees; do - substituteInPlace $t --replace "/usr/bin/env bash" "$(type -p bash)" - done - substituteInPlace wvtestrun --replace "/usr/bin/env perl" "${perl}/bin/perl" - - substituteInPlace t/test.sh --replace "/bin/pwd" "$(type -P pwd)" '' + optionalString par2Support '' substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'" ''; @@ -51,33 +40,7 @@ stdenv.mkDerivation { postInstall = optionalString (elem stdenv.system platforms.linux) '' wrapProgram $out/bin/bup --prefix PYTHONPATH : \ ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse python.modules.readline ])} - - ## test it - make test - - # if make test passes the following probably passes, too - backup_init(){ - export BUP_DIR=$TMP/bup - PATH=$out/bin:$PATH - bup init - } - backup_make(){ - ( cd "$1"; tar -cvf - .) | bup split -n backup - } - backup_restore_latest(){ - bup join backup | ( cd "$1"; tar -xf - ) - } - backup_verify_integrity_latest(){ - bup fsck - } - backup_verify_latest(){ - # maybe closest would be to mount or use the FTP like server .. - true - } - - . ${import ../test-case.nix { inherit diffutils writeTextFile; }} - backup_test backup 100M + (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])} ''; meta = { |