From c85528c1acf698fd5edd5f7aa4349a78748b0a85 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Sun, 18 Aug 2024 20:40:13 -0400 Subject: [PATCH] backintime: 1.4.3 -> 1.5.2 --- .../networking/sync/backintime/common.nix | 5 +++-- .../networking/sync/backintime/qt.nix | 16 +++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 747300ccf048..95594dc93cb7 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/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,6 +24,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--python=${lib.getExe python'}" ]; preConfigure = '' + patchShebangs --build updateversion.sh cd common substituteInPlace configure \ --replace-fail "/.." "" \ diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index d0d4fa813017..136b91a0623c 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/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"' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a18fff0194..445d542b06a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29415,7 +29415,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;