uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
143
pkgs/tools/backup/duplicity/default.nix
Normal file
143
pkgs/tools/backup/duplicity/default.nix
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, python3
|
||||
, librsync
|
||||
, ncftp
|
||||
, gnupg
|
||||
, gnutar
|
||||
, par2cmdline
|
||||
, util-linux
|
||||
, rsync
|
||||
, makeWrapper
|
||||
, gettext
|
||||
}:
|
||||
let
|
||||
pythonPackages = python3.pkgs;
|
||||
inherit (lib.versions) majorMinor splitVersion;
|
||||
majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "duplicity";
|
||||
version = "0.8.20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "duplicity";
|
||||
repo = "duplicity";
|
||||
rev = "rel.${version}";
|
||||
sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# We use the tar binary on all platforms.
|
||||
./gnutar-in-test.patch
|
||||
|
||||
# Our Python infrastructure runs test in installCheckPhase so we need
|
||||
# to make the testing code stop assuming it is run from the source directory.
|
||||
./use-installed-scripts-in-test.patch
|
||||
|
||||
# https://gitlab.com/duplicity/duplicity/-/merge_requests/64
|
||||
# remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch";
|
||||
sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
# Broken on Linux in Nix' build environment
|
||||
./linux-disable-timezone-test.patch
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
preConfigure = ''
|
||||
# fix version displayed by duplicity --version
|
||||
# see SourceCopy in setup.py
|
||||
ls
|
||||
for i in bin/*.1 duplicity/__init__.py; do
|
||||
substituteInPlace "$i" --replace '$version' "${version}"
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
gettext
|
||||
pythonPackages.wrapPython
|
||||
pythonPackages.setuptools-scm
|
||||
];
|
||||
buildInputs = [
|
||||
librsync
|
||||
];
|
||||
|
||||
pythonPath = with pythonPackages; [
|
||||
b2sdk
|
||||
boto
|
||||
boto3
|
||||
cffi
|
||||
cryptography
|
||||
ecdsa
|
||||
idna
|
||||
pygobject3
|
||||
fasteners
|
||||
lockfile
|
||||
paramiko
|
||||
pyasn1
|
||||
pycrypto
|
||||
pydrive2
|
||||
future
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gnupg # Add 'gpg' to PATH.
|
||||
gnutar # Add 'tar' to PATH.
|
||||
librsync # Add 'rdiff' to PATH.
|
||||
par2cmdline # Add 'par2' to PATH.
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
util-linux # Add 'setsid' to PATH.
|
||||
] ++ (with pythonPackages; [
|
||||
lockfile
|
||||
mock
|
||||
pexpect
|
||||
pytest
|
||||
pytest-runner
|
||||
]);
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/duplicity \
|
||||
--prefix PATH : "${lib.makeBinPath [ gnupg ncftp rsync ]}"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$pythonPath"
|
||||
|
||||
# Add 'duplicity' to PATH for tests.
|
||||
# Normally, 'setup.py test' adds 'build/scripts-2.7/' to PATH before running
|
||||
# tests. However, 'build/scripts-2.7/duplicity' is not wrapped, so its
|
||||
# shebang is incorrect and it fails to run inside Nix' sandbox.
|
||||
# In combination with use-installed-scripts-in-test.patch, make 'setup.py
|
||||
# test' use the installed 'duplicity' instead.
|
||||
PATH="$out/bin:$PATH"
|
||||
|
||||
# Don't run developer-only checks (pep8, etc.).
|
||||
export RUN_CODE_TESTS=0
|
||||
|
||||
# check version string
|
||||
duplicity --version | grep ${version}
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Work around the following error when running tests:
|
||||
# > Max open files of 256 is too low, should be >= 1024.
|
||||
# > Use 'ulimit -n 1024' or higher to correct.
|
||||
ulimit -n 1024
|
||||
'';
|
||||
|
||||
# TODO: Fix test failures on macOS 10.13:
|
||||
#
|
||||
# > OSError: out of pty devices
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
|
||||
homepage = "https://duplicity.gitlab.io/duplicity-web/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
20
pkgs/tools/backup/duplicity/gnutar-in-test.patch
Normal file
20
pkgs/tools/backup/duplicity/gnutar-in-test.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/testing/functional/test_restart.py b/testing/functional/test_restart.py
|
||||
index 6d972c82..e8435fd5 100644
|
||||
--- a/testing/functional/test_restart.py
|
||||
+++ b/testing/functional/test_restart.py
|
||||
@@ -350,14 +350,7 @@ class RestartTestWithoutEncryption(RestartTest):
|
||||
https://launchpad.net/bugs/929067
|
||||
"""
|
||||
|
||||
- if platform.system().startswith(u'Linux'):
|
||||
- tarcmd = u"tar"
|
||||
- elif platform.system().startswith(u'Darwin'):
|
||||
- tarcmd = u"gtar"
|
||||
- elif platform.system().endswith(u'BSD'):
|
||||
- tarcmd = u"gtar"
|
||||
- else:
|
||||
- raise Exception(u"Platform %s not supported by tar/gtar." % platform.platform())
|
||||
+ tarcmd = u"tar"
|
||||
|
||||
# Intial normal backup
|
||||
self.backup(u"full", u"{0}/testfiles/blocktartest".format(_runtest_dir))
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
commit f0142706c377b7c133753db57b5c4c90baa2de30
|
||||
Author: Guillaume Girol <symphorien+git@xlumurb.eu>
|
||||
Date: Sun Jul 11 17:48:15 2021 +0200
|
||||
|
||||
diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py
|
||||
index 4be5000c..80545853 100644
|
||||
--- a/testing/unit/test_statistics.py
|
||||
+++ b/testing/unit/test_statistics.py
|
||||
@@ -63,6 +63,7 @@ class StatsObjTest(UnitTestCase):
|
||||
s1 = StatsDeltaProcess()
|
||||
assert s1.get_stat(u'SourceFiles') == 0
|
||||
|
||||
+ @unittest.skip("Broken on Linux in Nix' build environment")
|
||||
def test_get_stats_string(self):
|
||||
u"""Test conversion of stat object into string"""
|
||||
s = StatsObj()
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
commit ccd4dd92cd37acce1da20966ad9e4e0c7bcf1709
|
||||
Author: Guillaume Girol <symphorien+git@xlumurb.eu>
|
||||
Date: Sun Jul 11 12:00:00 2021 +0000
|
||||
|
||||
use installed duplicity when running tests
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index fa474f20..604a242a 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -205,10 +205,6 @@ class TestCommand(test):
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
- os.environ[u'PATH'] = u"%s:%s" % (
|
||||
- os.path.abspath(build_scripts_cmd.build_dir),
|
||||
- os.environ.get(u'PATH'))
|
||||
-
|
||||
test.run(self)
|
||||
|
||||
|
||||
diff --git a/testing/functional/__init__.py b/testing/functional/__init__.py
|
||||
index 4221576d..3cf44945 100644
|
||||
--- a/testing/functional/__init__.py
|
||||
+++ b/testing/functional/__init__.py
|
||||
@@ -111,7 +111,7 @@ class FunctionalTestCase(DuplicityTestCase):
|
||||
run_coverage = os.environ.get(u'RUN_COVERAGE', None)
|
||||
if run_coverage is not None:
|
||||
cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"])
|
||||
- cmd_list.extend([u"{0}/bin/duplicity".format(_top_dir)])
|
||||
+ cmd_list.extend([u"duplicity"])
|
||||
cmd_list.extend(options)
|
||||
cmd_list.extend([u"-v0"])
|
||||
cmd_list.extend([u"--no-print-statistics"])
|
||||
diff --git a/testing/functional/test_log.py b/testing/functional/test_log.py
|
||||
index 9dfc86a6..b9cb55db 100644
|
||||
--- a/testing/functional/test_log.py
|
||||
+++ b/testing/functional/test_log.py
|
||||
@@ -49,9 +49,9 @@ class LogTest(FunctionalTestCase):
|
||||
# Run actual duplicity command (will fail, because no arguments passed)
|
||||
basepython = os.environ.get(u'TOXPYTHON', None)
|
||||
if basepython is not None:
|
||||
- os.system(u"{0} {1}/bin/duplicity --log-file={2} >/dev/null 2>&1".format(basepython, _top_dir, self.logfile))
|
||||
+ os.system(u"{0} duplicity --log-file={1} >/dev/null 2>&1".format(basepython, self.logfile))
|
||||
else:
|
||||
- os.system(u"{0}/bin/duplicity --log-file={1} >/dev/null 2>&1".format(_top_dir, self.logfile))
|
||||
+ os.system(u"duplicity --log-file={0} >/dev/null 2>&1".format(self.logfile))
|
||||
|
||||
# The format of the file should be:
|
||||
# """ERROR 2
|
||||
diff --git a/testing/functional/test_rdiffdir.py b/testing/functional/test_rdiffdir.py
|
||||
index 0cbfdb33..47acd029 100644
|
||||
--- a/testing/functional/test_rdiffdir.py
|
||||
+++ b/testing/functional/test_rdiffdir.py
|
||||
@@ -44,7 +44,7 @@ class RdiffdirTest(FunctionalTestCase):
|
||||
basepython = os.environ.get(u'TOXPYTHON', None)
|
||||
if basepython is not None:
|
||||
cmd_list.extend([basepython])
|
||||
- cmd_list.extend([u"{0}/bin/rdiffdir".format(_top_dir)])
|
||||
+ cmd_list.extend([u"rdiffdir"])
|
||||
cmd_list.extend(argstring.split())
|
||||
cmdline = u" ".join([u'"%s"' % x for x in cmd_list])
|
||||
self.run_cmd(cmdline)
|
||||
Loading…
Add table
Add a link
Reference in a new issue