Merge pull request #311750 from SFrijters/maestral-refactor

python3Packages.maestral, maestral-qt: refactor

authored by OTABI Tomoya and committed by GitHub 9e171a09 fb561768

+13 -5
+6 -2
pkgs/applications/networking/maestral-qt/default.nix
··· 11 python3.pkgs.buildPythonApplication rec { 12 pname = "maestral-qt"; 13 version = "1.9.3"; 14 disabled = python3.pythonOlder "3.7"; 15 16 src = fetchFromGitHub { ··· 20 hash = "sha256-7Lt0Neobtofd1JDoz8BhGn+nFKaMLbM/6z0QQmtEKpA="; 21 }; 22 23 - format = "pyproject"; 24 25 - propagatedBuildInputs = with python3.pkgs; [ 26 click 27 markdown2 28 maestral
··· 11 python3.pkgs.buildPythonApplication rec { 12 pname = "maestral-qt"; 13 version = "1.9.3"; 14 + pyproject = true; 15 + 16 disabled = python3.pythonOlder "3.7"; 17 18 src = fetchFromGitHub { ··· 22 hash = "sha256-7Lt0Neobtofd1JDoz8BhGn+nFKaMLbM/6z0QQmtEKpA="; 23 }; 24 25 + build-system = with python3.pkgs; [ 26 + setuptools 27 + ]; 28 29 + dependencies = with python3.pkgs; [ 30 click 31 markdown2 32 maestral
+7 -3
pkgs/development/python-modules/maestral/default.nix
··· 31 buildPythonPackage rec { 32 pname = "maestral"; 33 version = "1.9.3"; 34 - format = "pyproject"; 35 36 disabled = pythonOlder "3.8"; 37 ··· 42 hash = "sha256-h7RDaCVICi3wl6/b1s01cINhFirDOpOXoxTPZIBH3jE="; 43 }; 44 45 - propagatedBuildInputs = [ 46 click 47 desktop-notifier 48 dbus-python ··· 67 68 makeWrapperArgs = [ 69 # Add the installed directories to the python path so the daemon can find them 70 - "--prefix PYTHONPATH : ${makePythonPath propagatedBuildInputs}" 71 "--prefix PYTHONPATH : $out/${python.sitePackages}" 72 ]; 73
··· 31 buildPythonPackage rec { 32 pname = "maestral"; 33 version = "1.9.3"; 34 + pyproject = true; 35 36 disabled = pythonOlder "3.8"; 37 ··· 42 hash = "sha256-h7RDaCVICi3wl6/b1s01cINhFirDOpOXoxTPZIBH3jE="; 43 }; 44 45 + build-system = [ 46 + setuptools 47 + ]; 48 + 49 + dependencies = [ 50 click 51 desktop-notifier 52 dbus-python ··· 71 72 makeWrapperArgs = [ 73 # Add the installed directories to the python path so the daemon can find them 74 + "--prefix PYTHONPATH : ${makePythonPath dependencies}" 75 "--prefix PYTHONPATH : $out/${python.sitePackages}" 76 ]; 77