From a420be1e79f3ad3fb80227caeff249454e701d61 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 16 Oct 2018 17:29:24 +0200
Subject: [PATCH] slixmpp: move out of python-modules, use gnupg
---
.../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
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";