From 495451554fc9e53e47dc86ece5f6e5c4736566b2 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Sat, 10 May 2025 20:08:53 +0200 Subject: [PATCH 1/3] deja-dup: 47.0 -> 48.1 --- pkgs/by-name/de/deja-dup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix index 056172d876fc..ac9352f78a47 100644 --- a/pkgs/by-name/de/deja-dup/package.nix +++ b/pkgs/by-name/de/deja-dup/package.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deja-dup"; - version = "47.0"; + version = "48.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "deja-dup"; rev = finalAttrs.version; - hash = "sha256-MjZ+NkNAzwEnC9R48Q5Cb3+c5jM7ooOv7+5TQ6Xo4LM="; + hash = "sha256-pB5J+ElSnAE7rX74mgQBgnbOTVFJk/zOUBsJmnVETUE="; }; patches = [ From 506a5143544a4e109f867b72b6fbe39b1eadd926 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Sun, 25 May 2025 22:55:07 +0200 Subject: [PATCH 2/3] deja-dup: 47.0 -> 48.2 --- pkgs/by-name/de/deja-dup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix index ac9352f78a47..0644dbd47458 100644 --- a/pkgs/by-name/de/deja-dup/package.nix +++ b/pkgs/by-name/de/deja-dup/package.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deja-dup"; - version = "48.1"; + version = "48.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "deja-dup"; rev = finalAttrs.version; - hash = "sha256-pB5J+ElSnAE7rX74mgQBgnbOTVFJk/zOUBsJmnVETUE="; + hash = "sha256-g6bGOlpiEMJ9d+xe2GJyTBWAuGlY9EZTlJaYhB/5Ldw="; }; patches = [ From 65f536eb58d4743e7468185beaa0bb2e32a81ad3 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Sat, 10 May 2025 20:18:42 +0200 Subject: [PATCH 3/3] deja-dup: add restic support --- pkgs/by-name/de/deja-dup/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix index 0644dbd47458..80b7a04c6fc9 100644 --- a/pkgs/by-name/de/deja-dup/package.nix +++ b/pkgs/by-name/de/deja-dup/package.nix @@ -22,6 +22,7 @@ json-glib, duplicity, rclone, + restic, nix-update-script, }: @@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dduplicity_command=${lib.getExe duplicity}" "-Drclone_command=${lib.getExe rclone}" + "-Denable_restic=true" + "-Drestic_command=${lib.getExe restic}" ]; preFixup = ''