Merge pull request #106361 from SFrijters/maestral-1.3
This commit is contained in:
commit
3e96635e90
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "maestral-qt";
|
pname = "maestral-qt";
|
||||||
version = "1.2.1";
|
version = "1.3.1";
|
||||||
disabled = python3.pkgs.pythonOlder "3.6";
|
disabled = python3.pkgs.pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "SamSchott";
|
owner = "SamSchott";
|
||||||
repo = "maestral-qt";
|
repo = "maestral-qt";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-7qpVyQUbT+GChJl1TnKOONSyRDvzQ0M2z9RdN7PNl9U=";
|
sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
@ -24,6 +24,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
maestral
|
maestral
|
||||||
packaging
|
packaging
|
||||||
pyqt5
|
pyqt5
|
||||||
|
] ++ stdenv.lib.optionals (pythonOlder "3.9") [
|
||||||
|
importlib-resources
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||||
|
|
|
@ -3,20 +3,22 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, python
|
, python
|
||||||
, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, watchdog
|
, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
|
||||||
|
, importlib-metadata
|
||||||
|
, importlib-resources
|
||||||
, dbus-next
|
, dbus-next
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "maestral";
|
pname = "maestral";
|
||||||
version = "1.2.1";
|
version = "1.3.1";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "SamSchott";
|
owner = "SamSchott";
|
||||||
repo = "maestral";
|
repo = "maestral";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM=";
|
sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -34,7 +36,12 @@ buildPythonPackage rec {
|
||||||
setuptools
|
setuptools
|
||||||
sdnotify
|
sdnotify
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
|
survey
|
||||||
watchdog
|
watchdog
|
||||||
|
] ++ stdenv.lib.optionals (pythonOlder "3.8") [
|
||||||
|
importlib-metadata
|
||||||
|
] ++ stdenv.lib.optionals (pythonOlder "3.9") [
|
||||||
|
importlib-resources
|
||||||
] ++ stdenv.lib.optionals stdenv.isLinux [
|
] ++ stdenv.lib.optionals stdenv.isLinux [
|
||||||
dbus-next
|
dbus-next
|
||||||
];
|
];
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
{ stdenv
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, wrapio
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "survey";
|
||||||
|
version = "3.1.1";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
wrapio
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "survey" ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = "https://github.com/Exahilosys/survey";
|
||||||
|
description = "A simple library for creating beautiful interactive prompts";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ sfrijters ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ stdenv
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "wrapio";
|
||||||
|
version = "0.3.8";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo";
|
||||||
|
};
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "wrapio" ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = "https://github.com/Exahilosys/wrapio";
|
||||||
|
description = "Handling event-based streams";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ sfrijters ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -3649,7 +3649,24 @@ in {
|
||||||
|
|
||||||
macropy = callPackage ../development/python-modules/macropy { };
|
macropy = callPackage ../development/python-modules/macropy { };
|
||||||
|
|
||||||
maestral = callPackage ../development/python-modules/maestral { };
|
maestral = callPackage ../development/python-modules/maestral {
|
||||||
|
|
||||||
|
# https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048
|
||||||
|
survey = self.survey.overridePythonAttrs (old: rec {
|
||||||
|
version = "2.2.1";
|
||||||
|
src = old.src.override {
|
||||||
|
inherit version;
|
||||||
|
sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
watchdog = self.watchdog.overridePythonAttrs (old: rec {
|
||||||
|
version = "0.10.3";
|
||||||
|
src = old.src.override {
|
||||||
|
inherit version;
|
||||||
|
sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
magic = callPackage ../development/python-modules/magic { };
|
magic = callPackage ../development/python-modules/magic { };
|
||||||
|
|
||||||
|
@ -7123,6 +7140,8 @@ in {
|
||||||
|
|
||||||
sure = callPackage ../development/python-modules/sure { };
|
sure = callPackage ../development/python-modules/sure { };
|
||||||
|
|
||||||
|
survey = callPackage ../development/python-modules/survey { };
|
||||||
|
|
||||||
suseapi = callPackage ../development/python-modules/suseapi { };
|
suseapi = callPackage ../development/python-modules/suseapi { };
|
||||||
|
|
||||||
svg2tikz = callPackage ../development/python-modules/svg2tikz { };
|
svg2tikz = callPackage ../development/python-modules/svg2tikz { };
|
||||||
|
@ -7813,6 +7832,8 @@ in {
|
||||||
|
|
||||||
wptserve = callPackage ../development/python-modules/wptserve { };
|
wptserve = callPackage ../development/python-modules/wptserve { };
|
||||||
|
|
||||||
|
wrapio = callPackage ../development/python-modules/wrapio { };
|
||||||
|
|
||||||
wrapt = callPackage ../development/python-modules/wrapt { };
|
wrapt = callPackage ../development/python-modules/wrapt { };
|
||||||
|
|
||||||
wrf-python = callPackage ../development/python-modules/wrf-python { };
|
wrf-python = callPackage ../development/python-modules/wrf-python { };
|
||||||
|
|
Loading…
Reference in New Issue