public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68478 from peterhoeg/u/maestral

Browse Source 
maestral: 0.2.6 -> 0.4.0
This commit is contained in:
Peter Hoeg 2019-09-23 11:20:18 +08:00 committed by GitHub
commit fd3b329068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/maestral/default.nix
View File

@ -1,21 +1,23 @@
{ lib, python3Packages, fetchFromGitHub { stdenv, lib, python3Packages, fetchFromGitHub
, withGui ? false, wrapQtAppsHook ? null }: , withGui ? false, wrapQtAppsHook ? null }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "maestral${lib.optionalString withGui "-gui"}"; pname = "maestral${lib.optionalString withGui "-gui"}";
version = "0.2.6"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral-dropbox"; repo = "maestral-dropbox";
rev = "v${version}"; rev = "v${version}";
sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf"; sha256 = "1jjn9cz43850xvs52gvx16qc5z4l91y4kpn6fpl05iwgaisbi1ws";
}; };
disabled = python3Packages.pythonOlder "3.6"; disabled = python3Packages.pythonOlder "3.6";
propagatedBuildInputs = (with python3Packages; [ propagatedBuildInputs = (with python3Packages; [
blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog
] ++ lib.optionals stdenv.isLinux [
sdnotify systemd
] ++ lib.optional withGui pyqt5); ] ++ lib.optional withGui pyqt5);
nativeBuildInputs = lib.optional withGui wrapQtAppsHook; nativeBuildInputs = lib.optional withGui wrapQtAppsHook;

15
pkgs/development/python-modules/keyring/default.nix
View File

@ -1,27 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, setuptools_scm, entrypoints, secretstorage , dbus-python, setuptools_scm, entrypoints, secretstorage
, pytest, pytest-flake8 }: , pytest, pytest-flake8 }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "keyring"; pname = "keyring";
version = "18.0.1"; version = "19.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"; sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a";
}; };
nativeBuildInputs = [ setuptools_scm ]; nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest pytest-flake8 ]; checkInputs = [ pytest pytest-flake8 ];
propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
doCheck = !stdenv.isDarwin; # checks try to access a darwin path on linux
doCheck = false;
checkPhase = ''
py.test
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Store and access your passwords safely"; description = "Store and access your passwords safely";