mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Merge pull request #206453 from SFrijters/maestral-1.6.4
This commit is contained in:
commit
0eac96c810
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "maestral-qt";
|
pname = "maestral-qt";
|
||||||
version = "1.6.3";
|
version = "1.6.5";
|
||||||
disabled = python3.pythonOlder "3.7";
|
disabled = python3.pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "SamSchott";
|
owner = "SamSchott";
|
||||||
repo = "maestral-qt";
|
repo = "maestral-qt";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-Fvr5WhrhxPBeAMsrVj/frg01qgt2SeWgrRJYgBxRFHc=";
|
hash = "sha256-yKsCM8LZ/GR/bc2WW+Ml1vSroB4iaxh09Az/B+aIVBU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
|
@ -9,24 +9,25 @@
|
||||||
, desktop-notifier
|
, desktop-notifier
|
||||||
, dropbox
|
, dropbox
|
||||||
, fasteners
|
, fasteners
|
||||||
|
, importlib-metadata
|
||||||
, keyring
|
, keyring
|
||||||
, keyrings-alt
|
, keyrings-alt
|
||||||
, packaging
|
, packaging
|
||||||
, pathspec
|
, pathspec
|
||||||
, Pyro5
|
, Pyro5
|
||||||
, requests
|
, requests
|
||||||
|
, rich
|
||||||
, setuptools
|
, setuptools
|
||||||
, sdnotify
|
|
||||||
, survey
|
, survey
|
||||||
|
, typing-extensions
|
||||||
, watchdog
|
, watchdog
|
||||||
, importlib-metadata
|
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, nixosTests
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "maestral";
|
pname = "maestral";
|
||||||
version = "1.6.3";
|
version = "1.6.5";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -35,7 +36,7 @@ buildPythonPackage rec {
|
||||||
owner = "SamSchott";
|
owner = "SamSchott";
|
||||||
repo = "maestral";
|
repo = "maestral";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-JVzaWwdHAn5JOruLEN9Z2/5eV1oh3J2NQffNI3RqYfA=";
|
hash = "sha256-YCPMPkvMaZ0uzTiiCbXFDpgDS0yGlfF0wKK2HhYmH+Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -44,18 +45,18 @@ buildPythonPackage rec {
|
||||||
dbus-python
|
dbus-python
|
||||||
dropbox
|
dropbox
|
||||||
fasteners
|
fasteners
|
||||||
|
importlib-metadata
|
||||||
keyring
|
keyring
|
||||||
keyrings-alt
|
keyrings-alt
|
||||||
packaging
|
packaging
|
||||||
pathspec
|
pathspec
|
||||||
Pyro5
|
Pyro5
|
||||||
requests
|
requests
|
||||||
|
rich
|
||||||
setuptools
|
setuptools
|
||||||
sdnotify
|
|
||||||
survey
|
survey
|
||||||
|
typing-extensions
|
||||||
watchdog
|
watchdog
|
||||||
] ++ lib.optionals (pythonOlder "3.8") [
|
|
||||||
importlib-metadata
|
|
||||||
];
|
];
|
||||||
|
|
||||||
makeWrapperArgs = [
|
makeWrapperArgs = [
|
||||||
|
|
Loading…
Reference in a new issue