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