Unverified Commit 6faf6af7 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #284601 from dotlambda/vorta-0.9.1 

vorta: 0.8.12 -> 0.9.1
parents 13d35504 0d13278b

pkgs/applications/backup/vorta/default.nix

+24 −30
Original line number Diff line number Diff line
@@ -3,44 +3,43 @@ 
, fetchFromGitHub

, wrapQtAppsHook

, borgbackup

, qt5

, qtbase

, qtwayland

, stdenv

, makeFontsConf

}:



python3Packages.buildPythonApplication rec {

  pname = "vorta";

  version = "0.8.12";

  version = "0.9.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "borgbase";

    repo = "vorta";

    rev = "v${version}";

    hash = "sha256-nLdLTh1qSKvOR2cE9HWQrIWQ9L+ynX4qF+lTtKn/Ubs=";

    hash = "sha256-wGlnldS2p92NAYAyRPqKjSneIlbdsOiJ0N42n/mMGFI=";

  };



  nativeBuildInputs = [ wrapQtAppsHook ];

  nativeBuildInputs = [

    python3Packages.setuptools

    wrapQtAppsHook

  ];



  buildInputs = lib.optionals stdenv.isLinux [

    qt5.qtwayland

    qtwayland

  ];



  propagatedBuildInputs = with python3Packages; [

    peewee

    pyqt5

    python-dateutil

    pyqt6

    psutil

    qdarkstyle

    secretstorage

    appdirs

    setuptools

    platformdirs

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

    --replace setuptools_git "" \

    --replace pytest-runner ""



    substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \

    --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic"

  '';
@@ -63,33 +62,28 @@ python3Packages.buildPythonApplication rec { 
    pytestCheckHook

  ];



  preCheck = ''

  preCheck = let

    fontsConf = makeFontsConf {

      fontDirectories = [ ];

    };

  in ''

    export HOME=$(mktemp -d)

    export FONTCONFIG_FILE=${fontsConf};

    # For tests/test_misc.py::test_autostart

    mkdir -p $HOME/.config/autostart

    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"

    export QT_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}"

    export QT_QPA_PLATFORM=offscreen

  '';



  disabledTestPaths = [

    "tests/test_archives.py"

    "tests/test_borg.py"

    "tests/test_lock.py"

    "tests/test_notifications.py"

  ];



  disabledTests = [

    "diff_archives_dict_issue-Users"

    "diff_archives-test"

    "test_repo_unlink"

    "test_repo_add_success"

    "test_ssh_dialog"

    "test_create"

    "test_scheduler_create_backup"

    # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*)

    "tests/test_excludes.py"

    "tests/integration"

    "tests/unit"

  ];



  meta = with lib; {

    changelog = "https://github.com/borgbase/vorta/releases/tag/v0.8.10";

    changelog = "https://github.com/borgbase/vorta/releases/tag/${src.rev}";

    description = "Desktop Backup Client for Borg";

    homepage = "https://vorta.borgbase.com/";

    license = licenses.gpl3Only;

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -7798,7 +7798,7 @@ with pkgs; 
    (callPackage ../development/libraries/volk { })

  ;













  vorta = libsForQt5.callPackage ../applications/backup/vorta { };













  vorta = qt6Packages.callPackage ../applications/backup/vorta { };





























  vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };