From ec9d761628a70264dc117e889f12ab27da26474e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 11:39:41 +0200 Subject: slixmpp: 1.2.4-post1 -> 1.4.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 607b4b610188..db7d56919cbe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8001,13 +8001,13 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.2.4.post1"; + version = "1.4.0"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk"; + sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2"; }; patchPhase = '' -- cgit 1.4.1 From e83b15c1b19d53cf5d5e2867dea2704445922267 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 11:40:15 +0200 Subject: poezio: 0.11 -> 0.12 --- .../python-modules/poezio/fix_gnupg_import.patch | 12 ------------ pkgs/top-level/python-packages.nix | 13 +++++-------- 2 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/python-modules/poezio/fix_gnupg_import.patch (limited to 'pkgs') 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 ''; -- cgit 1.4.1 From a420be1e79f3ad3fb80227caeff249454e701d61 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 17:29:24 +0200 Subject: slixmpp: move out of python-modules, use gnupg --- .../development/python-modules/slixmpp/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------------- 2 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/slixmpp/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix new file mode 100644 index 000000000000..0a8e5accea87 --- /dev/null +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, pythonOlder, fetchurl, aiodns, pyasn1, pyasn1-modules, gnupg }: +buildPythonPackage rec { + name = "slixmpp-${version}"; + version = "1.4.0"; + + disabled = pythonOlder "3.4"; + + src = fetchurl { + url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; + sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2"; + }; + + patchPhase = '' + substituteInPlace slixmpp/thirdparty/gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'" + ''; + + propagatedBuildInputs = [ aiodns pyasn1 pyasn1-modules gnupg ]; + + meta = { + description = "Elegant Python library for XMPP"; + license = lib.licenses.mit; + homepage = https://dev.louiz.org/projects/slixmpp; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9887e27f89c..aa7c6abfb50e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7999,30 +7999,7 @@ in { }; }; - slixmpp = buildPythonPackage rec { - name = "slixmpp-${version}"; - version = "1.4.0"; - - disabled = pythonOlder "3.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2"; - }; - - patchPhase = '' - substituteInPlace slixmpp/thirdparty/gnupg.py \ - --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" - ''; - - propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; - - meta = { - description = "Elegant Python library for XMPP"; - license = licenses.mit; - homepage = https://dev.louiz.org/projects/slixmpp; - }; - }; + slixmpp = callPackage ../development/python-modules/slixmpp {}; netaddr = buildPythonPackage rec { pname = "netaddr"; -- cgit 1.4.1 From d6a003e95305f87690fb07af7317f8269ee8aac3 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 17 Oct 2018 09:48:30 +0200 Subject: poezio: move out of python-packages.nix --- .../instant-messengers/poezio/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +-------------------- 2 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/poezio/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix new file mode 100644 index 000000000000..b5fa1ccc2f41 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonApplication, fetchurl, pythonOlder +, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig }: +buildPythonApplication rec { + name = "poezio-${version}"; + version = "0.12"; + + disabled = pythonOlder "3.4"; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi ]; + nativeBuildInputs = [ pkgconfig ]; + + src = fetchurl { + url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz"; + sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz"; + }; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Free console XMPP client"; + homepage = https://poez.io; + license = licenses.mit; + maintainers = [ maintainers.lsix ]; + }; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa7c6abfb50e..ac9a00550b0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16005,32 +16005,7 @@ EOF }; }; - poezio = buildPythonApplication rec { - name = "poezio-${version}"; - version = "0.12"; - - disabled = pythonOlder "3.4"; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 cffi ]; - nativeBuildInputs = with pkgs; [ pkgconfig ]; - - src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz"; - sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz"; - }; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Free console XMPP client"; - homepage = https://poez.io; - license = licenses.mit; - maintainers = [ maintainers.lsix ]; - }; - }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { }; potr = callPackage ../development/python-modules/potr {}; -- cgit 1.4.1