summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2018-10-16 11:40:15 +0200
committerLinus Heckemann <git@sphalerite.org>2018-10-17 10:08:01 +0200
commite83b15c1b19d53cf5d5e2867dea2704445922267 (patch)
tree6df9d6f3f697795ebfc759facc94df016d0f2d2d /pkgs
parentec9d761628a70264dc117e889f12ab27da26474e (diff)
downloadnixlib-e83b15c1b19d53cf5d5e2867dea2704445922267.tar
nixlib-e83b15c1b19d53cf5d5e2867dea2704445922267.tar.gz
nixlib-e83b15c1b19d53cf5d5e2867dea2704445922267.tar.bz2
nixlib-e83b15c1b19d53cf5d5e2867dea2704445922267.tar.lz
nixlib-e83b15c1b19d53cf5d5e2867dea2704445922267.tar.xz
nixlib-e83b15c1b19d53cf5d5e2867dea2704445922267.tar.zst
nixlib-e83b15c1b19d53cf5d5e2867dea2704445922267.zip
poezio: 0.11 -> 0.12
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/poezio/fix_gnupg_import.patch12
-rw-r--r--pkgs/top-level/python-packages.nix13
2 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch
deleted file mode 100644
index d75e09b722bf..000000000000
--- a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur poezio-0.10.orig/plugins/gpg/__init__.py poezio-0.10/plugins/gpg/__init__.py
---- poezio-0.10.orig/plugins/gpg/__init__.py	2016-07-27 19:02:41.000000000 +0200
-+++ poezio-0.10/plugins/gpg/__init__.py	2016-11-16 14:17:06.011128631 +0100
-@@ -105,7 +105,7 @@
- .. _XEP-0027: http://xmpp.org/extensions/xep-0027.html
- 
- """
--from gpg import gnupg
-+import slixmpp.thirdparty.gnupg as gnupg
- from slixmpp.xmlstream.stanzabase import JID
- 
- from xml.etree import cElementTree as ET
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db7d56919cbe..c9887e27f89c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16030,22 +16030,19 @@ EOF
 
   poezio = buildPythonApplication rec {
     name = "poezio-${version}";
-    version = "0.11";
+    version = "0.12";
 
     disabled = pythonOlder "3.4";
 
     buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ];
+    propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 cffi ];
+    nativeBuildInputs = with pkgs; [ pkgconfig ];
 
     src = pkgs.fetchurl {
-      url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz";
-      sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0";
+      url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz";
+      sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz";
     };
 
-    patches = [
-      ../development/python-modules/poezio/fix_gnupg_import.patch
-    ];
-
     checkPhase = ''
       py.test
     '';