public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97268 from StephenWithPH/duplicity_0.8.15

Browse Source 
duplicity: 0.8.13 -> 0.8.15
This commit is contained in:
Sandro 2020-12-29 14:45:18 +01:00 committed by GitHub
commit e3bca76d74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/backup/duplicity/default.nix
View File

@ -19,11 +19,11 @@ let
in in
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "duplicity"; pname = "duplicity";
version = "0.8.13"; version = "0.8.15";
src = fetchurl { src = fetchurl {
url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz";
sha256 = "0lflg1ay4q4w9qzpmh6y2hza4fc3ig12q44qkd80ks17hj21bxa6"; sha256 = "1kg467mxg5a97v1rlv4shk32krgv8ys4nczq4b11av4bp1lgysdc";
}; };
patches = [ patches = [

18
pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
View File

@ -38,12 +38,12 @@
# """ERROR 2 # """ERROR 2
--- a/testing/functional/test_rdiffdir.py --- a/testing/functional/test_rdiffdir.py
+++ b/testing/functional/test_rdiffdir.py +++ b/testing/functional/test_rdiffdir.py
@@ -38,7 +38,7 @@ class RdiffdirTest(FunctionalTestCase): @@ -42,7 +42,7 @@ class RdiffdirTest(FunctionalTestCase):
basepython = os.environ.get(u'TOXPYTHON', None)
def run_rdiffdir(self, argstring): if basepython is not None:
u"""Run rdiffdir with given arguments""" cmd_list.extend([basepython])
- self.run_cmd(u"../bin/rdiffdir " + argstring) - cmd_list.extend([u"../bin/rdiffdir"])
+ self.run_cmd(u"rdiffdir " + argstring) + cmd_list.extend([u"rdiffdir"])
cmd_list.extend(argstring.split())
def run_cycle(self, dirname_list): cmdline = u" ".join([u'"%s"' % x for x in cmd_list])
u"""Run diff/patch cycle on directories in dirname_list""" self.run_cmd(cmdline)