summary refs log tree commit diff
diff options
context:
space:
mode:
authorStephenWithPH <StephenWithPH@users.noreply.github.com>2022-07-18 15:57:32 -0700
committerStephenWithPH <StephenWithPH@users.noreply.github.com>2022-07-18 15:57:32 -0700
commitf2187ade7544a405bd2ffeed9a264a6518600855 (patch)
treef1e2a3b193ba2cd6cc89889f7c219eb54054ce85
parentf2c952b68837c2437b88039ff01149bb0954e6e0 (diff)
downloadnixpkgs-f2187ade7544a405bd2ffeed9a264a6518600855.tar
nixpkgs-f2187ade7544a405bd2ffeed9a264a6518600855.tar.gz
nixpkgs-f2187ade7544a405bd2ffeed9a264a6518600855.tar.bz2
nixpkgs-f2187ade7544a405bd2ffeed9a264a6518600855.tar.lz
nixpkgs-f2187ade7544a405bd2ffeed9a264a6518600855.tar.xz
nixpkgs-f2187ade7544a405bd2ffeed9a264a6518600855.tar.zst
nixpkgs-f2187ade7544a405bd2ffeed9a264a6518600855.zip
duplicity: 0.8.20 -> 0.8.23
-rw-r--r--pkgs/tools/backup/duplicity/default.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 46f841c8f5b..d6ab926c0ca 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -19,13 +19,13 @@ let
 in
 pythonPackages.buildPythonApplication rec {
   pname = "duplicity";
-  version = "0.8.20";
+  version = "0.8.23";
 
   src = fetchFromGitLab {
     owner = "duplicity";
     repo = "duplicity";
     rev = "rel.${version}";
-    sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm";
+    sha256 = "0my015zc8751smjgbsysmca7hvdm96cjw5zilqn3zq971nmmrksb";
   };
 
   patches = [
@@ -35,13 +35,6 @@ pythonPackages.buildPythonApplication rec {
     # 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