JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #194821 from SFrijters/maestral-qt-1.6.3

Browse Source 
maestral-qt: 1.5.3 -> 1.6.3
This commit is contained in:
Christian Kögler 2022-10-30 23:00:51 +01:00 committed by GitHub
commit 9b32e3415e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/applications/networking/maestral-qt/default.nix
View File

@ -1,63 +1,50 @@
{ lib
, fetchFromGitHub
, python3
, wrapQtAppsHook
, qt6
, nixosTests
}:
let
inherit (pypkgs) makePythonPath;
pypkgs = (python3.override {
packageOverrides = self: super: {
# Use last available version of maestral that still supports PyQt5
# Remove this override when PyQt6 is available
maestral = super.maestral.overridePythonAttrs (old: rec {
version = "1.5.3";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "refs/tags/v${version}";
hash = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao=";
};
});
};
}).pkgs;
in
pypkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.5.3";
disabled = pypkgs.pythonOlder "3.6";
version = "1.6.3";
disabled = python3.pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "refs/tags/v${version}";
sha256 = "sha256-zaG9Zwz9S/SVb7xDa7eXkjLNt1BhA1cQ3I18rVt+8uQ=";
sha256 = "sha256-Fvr5WhrhxPBeAMsrVj/frg01qgt2SeWgrRJYgBxRFHc=";
};
format = "pyproject";
propagatedBuildInputs = with pypkgs; [
propagatedBuildInputs = with python3.pkgs; [
click
markdown2
maestral
packaging
pyqt5
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
pyqt6
];
nativeBuildInputs = [ wrapQtAppsHook ];
buildInputs = [
qt6.qtbase
qt6.qtsvg # Needed for the systray icon
];
makeWrapperArgs = [
nativeBuildInputs = [
qt6.wrapQtAppsHook
];
dontWrapQtApps = true;
makeWrapperArgs = with python3.pkgs; [
# Firstly, add all necessary QT variables
"\${qtWrapperArgs[@]}"
# Add the installed directories to the python path so the daemon can find them
"--prefix PYTHONPATH : ${makePythonPath (pypkgs.requiredPythonModules pypkgs.maestral.propagatedBuildInputs)}"
"--prefix PYTHONPATH : ${makePythonPath [ pypkgs.maestral ]}"
"--prefix PYTHONPATH : ${makePythonPath (requiredPythonModules maestral.propagatedBuildInputs)}"
"--prefix PYTHONPATH : ${makePythonPath [ maestral ]}"
];
# no tests