From 53065b9d8f17692f059844d39900ef29bb17e4fa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 May 2023 11:16:25 +0200
Subject: [PATCH] poezio: modernize

- use GitLab source
- add pythonImportsCheck
- switch to python3.pkgs.buildPythonApplication
---
 .../instant-messengers/poezio/default.nix     | 41 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix
index 7d83dcf2d23c..a0163322064e 100644
--- a/pkgs/applications/networking/instant-messengers/poezio/default.nix
+++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix
@@ -1,59 +1,52 @@
 { lib
-, aiodns
-, buildPythonApplication
-, cffi
-, fetchFromGitHub
-, mpd2
+, fetchFromGitLab
 , pkg-config
-, potr
-, pyasn1
-, pyasn1-modules
-, pyinotify
-, pytestCheckHook
-, pythonOlder
-, setuptools
-, slixmpp
-, typing-extensions
+, python3
 }:
 
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "poezio";
   version = "0.13.1";
-  disabled = pythonOlder "3.4";
+  format = "setuptools";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
+    domain = "lab.louiz.org";
     owner = pname;
     repo = pname;
-    rev = "v${version}";
-    sha256 = "041y61pcbdb86s04qwp8s1g6bp84yskc7vdizwpi2hz18y01x5fy";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-3pUegEfhQxEv/7Htw6b2BN1lXtDockyANmi1xW4wPhA=";
   };
 
   nativeBuildInputs = [
     pkg-config
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     aiodns
     cffi
     mpd2
     potr
     pyasn1
     pyasn1-modules
+    pycares
     pyinotify
-    setuptools
     slixmpp
-  ] ++ lib.optionals (pythonOlder "3.7") [
     typing-extensions
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [
+    "poezio"
+  ];
+
   meta = with lib; {
     description = "Free console XMPP client";
     homepage = "https://poez.io";
+    changelog = "https://lab.louiz.org/poezio/poezio/-/blob/v${version}/CHANGELOG";
     license = licenses.zlib;
-    maintainers = [ maintainers.lsix ];
+    maintainers = with maintainers; [ lsix ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab527c5ac7f6..fb5249612c5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33415,7 +33415,7 @@ with pkgs;
 
   polar-bookshelf1 = callPackage ../applications/misc/polar-bookshelf1 { };
 
-  poezio = python3Packages.poezio;
+  poezio = callPackage ../applications/networking/instant-messengers/poezio { };
 
   pommed_light = callPackage ../os-specific/linux/pommed-light { };