From 287c9751167baecada36692cdf097ad4a957f35b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 2 Aug 2025 20:31:20 +0800 Subject: [PATCH] timeshift: 24.06.6 -> 25.07.4 https://github.com/linuxmint/timeshift/compare/24.06.6...25.07.4 The timeshift-launcher substitution upstreamed: https://github.com/linuxmint/timeshift/commit/98af1049992693599be78528029abba5421c4f19 run-parts introduced in: https://github.com/linuxmint/timeshift/commit/b20c307d455a04df3d8bcd2cf9eee01c26b5b999 --- pkgs/applications/backup/timeshift/default.nix | 2 ++ pkgs/applications/backup/timeshift/unwrapped.nix | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index c398fe58d7a5..c5123672fbf2 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -3,6 +3,7 @@ btrfs-progs, coreutils, cron, + debianutils, grubPackage, mount, psmisc, @@ -17,6 +18,7 @@ in btrfs-progs coreutils cron + debianutils grubPackage mount psmisc diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 571672dd0d1e..81b6bbb08ed3 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.6"; + version = "25.07.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-umMekxP9bvV01KzfIh2Zxa9Xb+tR5x+tG9dOnBIOkjY="; + hash = "sha256-yrLpEhSt7QB0qWCXjIjTVeXKRpgue2pVdV+6hSixeuA="; }; postPatch = '' @@ -37,10 +37,8 @@ stdenv.mkDerivation rec { --replace-fail "/usr/share" "$out/share" # Substitute app_command to look for the `timeshift-gtk` in $out. - # Substitute the `pkexec ...` as a hack to run a GUI application like Timeshift as root without setting up the corresponding pkexec policy. substituteInPlace ./src/timeshift-launcher \ - --replace-fail "app_command='timeshift-gtk'" "app_command=$out/bin/timeshift-gtk" \ - --replace-fail ${lib.escapeShellArg ''pkexec ''${app_command}''} ${lib.escapeShellArg ''pkexec env DISPLAY="$DISPLAY" XAUTHORITY="$XAUTHORITY" "''${app_command}"''} + --replace-fail "app_command='timeshift-gtk'" "app_command=$out/bin/timeshift-gtk" ''; nativeBuildInputs = [