backintime: 1.4.3 -> 1.5.2 (#335738)

pkgs/applications/networking/sync/backintime/common.nix

@@ -7,13 +7,13 @@ let
   apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ];
 in stdenv.mkDerivation rec {
   pname = "backintime-common";
-  version = "1.4.3";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "bit-team";
     repo = "backintime";
     rev = "v${version}";
-    sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg=";
+    sha256 = "sha256-yfCSTzCmhXDBC1vYqwgVjsYUtc5VO1VW74BmIB0hHfE=";
   };
 
   nativeBuildInputs = [ makeWrapper gettext ];
@@ -24,12 +24,13 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--python=${lib.getExe python'}" ];
 
   preConfigure = ''
+    patchShebangs --build updateversion.sh
     cd common
     substituteInPlace configure \
-      --replace "/.." "" \
-      --replace "share/backintime" "${python'.sitePackages}/backintime"
-    substituteInPlace "backintime" \
-      --replace "share" "${python'.sitePackages}"
+      --replace-fail "/.." "" \
+      --replace-fail "share/backintime" "${python'.sitePackages}/backintime"
+    substituteInPlace "backintime" "backintime-askpass" \
+      --replace-fail "share" "${python'.sitePackages}"
   '';
 
   dontAddPrefix = true;
@@ -44,10 +45,11 @@ in stdenv.mkDerivation rec {
     description = "Simple backup tool for Linux";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ stephen-huan ];
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.linux;
+    mainProgram = "backintime";
     longDescription = ''
       Back In Time is a simple backup tool (on top of rsync) for Linux
-      inspired from “flyback project” and “TimeVault”. The backup is
+      inspired from "flyback project" and "TimeVault". The backup is
       done by taking snapshots of a specified set of directories.
     '';
   };

pkgs/applications/networking/sync/backintime/qt.nix

@@ -1,19 +1,25 @@
-{ lib, mkDerivation, backintime-common, python3, polkit, which, su, coreutils, util-linux }:
+{ lib, stdenv, backintime-common, python3, polkit, which, su, coreutils, util-linux,
+wrapQtAppsHook, qtbase, qtwayland }:
 
 let
-  python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common packaging ]);
+  python' = python3.withPackages (ps: with ps; [ pyqt6 backintime-common packaging ]);
 in
-mkDerivation {
+stdenv.mkDerivation {
   inherit (backintime-common)
-    version src installFlags meta dontAddPrefix nativeBuildInputs;
+    version src installFlags meta dontAddPrefix;
 
   pname = "backintime-qt";
 
-  buildInputs = [ python' backintime-common ];
+  buildInputs = [ python' backintime-common qtbase qtwayland ];
+
+  nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [
+    wrapQtAppsHook
+  ];
 
   configureFlags = [ "--python=${lib.getExe python'}" ];
 
   preConfigure = ''
+    patchShebangs --build updateversion.sh
     cd qt
     substituteInPlace qttools_path.py \
       --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"'
@@ -24,23 +30,23 @@ mkDerivation {
       --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH"
 
     substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \
-      --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt"
+      --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt"
 
     substituteInPlace "$out/share/applications/backintime-qt-root.desktop" \
-      --replace "/usr/bin/backintime-qt" "backintime-qt"
+      --replace-fail "/usr/bin/backintime-qt" "backintime-qt"
 
     substituteInPlace "$out/share/backintime/qt/serviceHelper.py" \
-      --replace "'which'" "'${lib.getBin which}/bin/which'" \
-      --replace "/bin/su" "${lib.getBin su}/bin/su" \
-      --replace "/usr/bin/backintime" "${lib.getBin backintime-common}/bin/backintime" \
-      --replace "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \
-      --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice"
+      --replace-fail "'which'" "'${lib.getExe which}'" \
+      --replace-fail "/bin/su" "${lib.getBin su}/bin/su" \
+      --replace-fail "/usr/bin/backintime" "${lib.getExe backintime-common}" \
+      --replace-fail "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \
+      --replace-fail "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice"
 
     substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \
-      --replace "/usr/share/backintime" "$out/share/backintime"
+      --replace-fail "/usr/share/backintime" "$out/share/backintime"
 
     substituteInPlace "$out/bin/backintime-qt_polkit" \
-      --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt"
+      --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt"
 
     wrapProgram "$out/bin/backintime-qt_polkit" \
       --prefix PATH : "${lib.getBin polkit}/bin:$PATH"

pkgs/top-level/all-packages.nix

@@ -28903,7 +28903,7 @@ with pkgs;
 
   backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
 
-  backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { };
+  backintime-qt = qt6.callPackage ../applications/networking/sync/backintime/qt.nix { };
 
   backintime = backintime-qt;