python3Packages.goobook: 3.4 -> 3.5
This commit is contained in:
parent
5fc8ce0041
commit
9550ba71fa
@ -1,27 +1,30 @@
|
|||||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
|
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
|
||||||
, google_api_python_client, simplejson, oauth2client, setuptools
|
, google_api_python_client, simplejson, oauth2client, setuptools, xdg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "goobook";
|
pname = "goobook";
|
||||||
version = "3.4";
|
version = "3.5";
|
||||||
disabled = !isPy3k;
|
disabled = !isPy3k;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg";
|
sha256 = "1rmfyma3gwdf5mrw4l3j66y86fy8hgdbd0z4a5kck0kcm3hy34j9";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Required for a breaking change in google-api-python-client 1.8.1:
|
|
||||||
patches = [ ./fix-build.patch ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
google_api_python_client simplejson oauth2client setuptools
|
google_api_python_client simplejson oauth2client setuptools xdg
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Search your google contacts from the command-line or mutt";
|
description = "Access your Google contacts from the command line";
|
||||||
|
longDescription = ''
|
||||||
|
The purpose of GooBook is to make it possible to use your Google Contacts
|
||||||
|
from the command-line and from MUAs such as Mutt.
|
||||||
|
It can be used from Mutt the same way as abook.
|
||||||
|
'';
|
||||||
homepage = "https://pypi.python.org/pypi/goobook";
|
homepage = "https://pypi.python.org/pypi/goobook";
|
||||||
|
changelog = "https://gitlab.com/goobook/goobook/-/blob/${version}/CHANGES.rst";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ primeos ];
|
maintainers = with maintainers; [ primeos ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
From 8de09b82c5ac900317043e1c1025f431516b6788 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Weiss <dev.primeos@gmail.com>
|
|
||||||
Date: Tue, 21 Apr 2020 21:41:04 +0200
|
|
||||||
Subject: [PATCH] Switch from the alias apiclient to googleapiclient
|
|
||||||
|
|
||||||
This fixes the package after a breaking change / bug in
|
|
||||||
google-api-python-client 1.8.1 (see [0] and a lot of duplicate issues).
|
|
||||||
|
|
||||||
The module apiclient is just an alias for googleapiclient [1].
|
|
||||||
|
|
||||||
[0]: https://github.com/googleapis/google-api-python-client/issues/870
|
|
||||||
[1]: https://github.com/googleapis/google-api-python-client/blob/v1.8.1/apiclient/__init__.py
|
|
||||||
---
|
|
||||||
goobook/goobook.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/goobook/goobook.py b/goobook/goobook.py
|
|
||||||
index 5bcb0b3..a2e25e9 100755
|
|
||||||
--- a/goobook/goobook.py
|
|
||||||
+++ b/goobook/goobook.py
|
|
||||||
@@ -31,7 +31,7 @@ import sys
|
|
||||||
import time
|
|
||||||
|
|
||||||
import httplib2
|
|
||||||
-from apiclient.discovery import build
|
|
||||||
+from googleapiclient.discovery import build
|
|
||||||
|
|
||||||
from goobook.storage import Storage, storageify, unstorageify
|
|
||||||
|
|
||||||
--
|
|
||||||
2.26.1
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user