Merge pull request #312250 from lucasew/20240516-fix-ablog

ablog: move to by-name, fix build and update

pkgs/by-name/ab/ablog/package.nix

@@ -1,16 +1,19 @@
 { lib
 , python3
-, fetchPypi
+, fetchFromGitHub
+, gitUpdater
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ablog";
-  version = "0.11.8";
+  version = "0.11.10";
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak=";
+  src = fetchFromGitHub {
+    owner = "sunpy";
+    repo = "ablog";
+    rev = "v${version}";
+    hash = "sha256-8NyFLGtMJLUkojEhWpWNZz3zlfgGVgSvgk4dDEz1jzs=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -31,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
+    defusedxml
   ];
 
   pytestFlagsArray = [
@@ -39,6 +43,8 @@ python3.pkgs.buildPythonApplication rec {
     "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
   ];
 
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
   meta = with lib; {
     description = "ABlog for blogging with Sphinx";
     mainProgram = "ablog";

pkgs/top-level/all-packages.nix

@@ -1497,8 +1497,6 @@ with pkgs;
 
   abduco = callPackage ../tools/misc/abduco { };
 
-  ablog = callPackage ../applications/misc/ablog { };
-
   acct = callPackage ../tools/system/acct { };
 
   accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };