diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-15 13:32:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-15 13:32:10 +0100 |
| commit | fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1 (patch) | |
| tree | 3e5e71243b238599367306c1d79970cdd28e73e9 /pkgs/tools/backup | |
| parent | 2fc67aca651a7b2b5e77bb41d61747db7801d951 (diff) | |
| parent | 766f89de3a9ac5b2ee6ab625f798fe53d9f60982 (diff) | |
| download | nixlib-fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1.tar nixlib-fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1.tar.gz nixlib-fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1.tar.bz2 nixlib-fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1.tar.lz nixlib-fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1.tar.xz nixlib-fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1.tar.zst nixlib-fb9b0e7d46b2cb74d8ea693065ab5d8a5a5c2fa1.zip | |
Merge pull request #82400 from B4dM4n/duplicity-update
duplicity: 0.8.10 -> 0.8.11.1596
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/duplicity/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 0d4e098129a6..e49d87c697cf 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -11,28 +11,25 @@ , rsync , backblaze-b2 , makeWrapper +, gettext }: - +let + inherit (stdenv.lib.versions) majorMinor splitVersion; + majorMinorPatch = v: builtins.concatStringsSep "." (stdenv.lib.take 3 (splitVersion v)); +in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.10"; + version = "0.8.11.1596"; src = fetchurl { - url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}fin1558.tar.gz"; - sha256 = "13apmavdc2cx3wxv2ymy97c575hc37xjhpa6b4sds8fkx2vrb0mh"; + url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; + sha256 = "1qdaaybwdc13nfwnwrqij4lc23iwy73lyqn5lb4iznq6axp6m0h9"; }; patches = [ # We use the tar binary on all platforms. ./gnutar-in-test.patch - # Make test respect TMPDIR env var. - # https://bugs.launchpad.net/duplicity/+bug/1862672 - (fetchurl { - url = "https://launchpadlibrarian.net/464404371/0001-Make-LogTest-respect-TMPDIR-env-variable.patch"; - hash = "sha256-wdy8mMurLhBS0ZTXmlIGGrIkS2gGBDwTp7TRxTSXBGo="; - }) - # 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 @@ -40,11 +37,14 @@ pythonPackages.buildPythonApplication rec { ./linux-disable-timezone-test.patch ]; - buildInputs = [ - librsync + nativeBuildInputs = [ makeWrapper + gettext pythonPackages.wrapPython ]; + buildInputs = [ + librsync + ]; propagatedBuildInputs = [ backblaze-b2 |