summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2019-08-14 14:29:36 +0800
committerGitHub <noreply@github.com>2019-08-14 14:29:36 +0800
commitd7fc23a0a6c258db73168c0bf2fc0760935aa96d (patch)
treee1365ab358c1bbd2c120fa274921f7f094e35a99
parent453d108417973c33094d78ed8759df8140ade88c (diff)
parenta67aec1746b8780fae3ca357d47010aa10e13fa8 (diff)
Merge pull request #66420 from peterhoeg/p/maestral
maestral: init at 0.2.6
-rw-r--r--pkgs/applications/networking/maestral/default.nix38
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix
new file mode 100644
index 000000000000..bfacac2eaf4d
--- /dev/null
+++ b/pkgs/applications/networking/maestral/default.nix
@@ -0,0 +1,38 @@
+{ lib, python3Packages, fetchFromGitHub
+, withGui ? false, wrapQtAppsHook ? null }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "maestral${lib.optionalString withGui "-gui"}";
+ version = "0.2.6";
+
+ src = fetchFromGitHub {
+ owner = "SamSchott";
+ repo = "maestral-dropbox";
+ rev = "v${version}";
+ sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf";
+ };
+
+ disabled = python3Packages.pythonOlder "3.6";
+
+ propagatedBuildInputs = (with python3Packages; [
+ blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog
+ ] ++ lib.optional withGui pyqt5);
+
+ nativeBuildInputs = lib.optional withGui wrapQtAppsHook;
+
+ postInstall = lib.optionalString withGui ''
+ makeQtWrapper $out/bin/maestral $out/bin/maestral-gui \
+ --add-flags gui
+ '';
+
+ # no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Open-source Dropbox client for macOS and Linux";
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.unix;
+ inherit (src.meta) homepage;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1830236aadad..117e2a6acdd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20487,6 +20487,10 @@ in
dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };
+ maestral = callPackage ../applications/networking/maestral { };
+
+ maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; };
+
insync = callPackage ../applications/networking/insync { };
libstrangle = callPackage ../tools/X11/libstrangle {