Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs

1 files changed, 17 insertions, 12 deletions

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 531232bf8e6e..c145b9d888f4 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -1,26 +1,31 @@
-{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }:
+{ lib, buildPythonPackage, pythonOlder, fetchFromGitLab
+, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl
+}:
 
-let
+buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "1.0.2";
-  name = "${pname}-${version}";
-in buildPythonPackage {
-  inherit pname version;
+  version = "2.0.2";
+
+  disabled = pythonOlder "3.7";
+
   # Tests aren't included in PyPI tarball.
-  src = fetchzip {
-    name = "${name}.tar.bz2";
-    url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
-        + "ref=${name}";
-    sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az";
+  src = fetchFromGitLab {
+    domain = "dev.gajim.org";
+    owner = "gajim";
+    repo = "python-nbxmpp";
+    rev = "nbxmpp-${version}";
+    sha256 = "0z27mxgfk7hvpx0xdrd8g9441rywv74yk7s83zjnc2mc7xvpwhf4";
   };
 
   buildInputs = [ precis-i18n ];
   propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ];
 
+  pythonImportsCheck = [ "nbxmpp" ];
+
   meta = with lib; {
     homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
     description = "Non-blocking Jabber/XMPP module";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ abbradar ];
   };
 }