From 4d6e011773176acead319a9869fc7420a5872349 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 16 May 2024 13:03:49 -0300
Subject: [PATCH 1/2] ablog: move to by-name, fix build

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 .../default.nix => by-name/ab/ablog/package.nix}   | 14 ++++++++++----
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/ablog/default.nix => by-name/ab/ablog/package.nix} (77%)

diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/by-name/ab/ablog/package.nix
similarity index 77%
rename from pkgs/applications/misc/ablog/default.nix
rename to pkgs/by-name/ab/ablog/package.nix
index 67b21e5199de..791c8598868c 100644
--- a/pkgs/applications/misc/ablog/default.nix
+++ b/pkgs/by-name/ab/ablog/package.nix
@@ -1,6 +1,7 @@
 { lib
 , python3
-, fetchPypi
+, fetchFromGitHub
+, gitUpdater
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -8,9 +9,11 @@ python3.pkgs.buildPythonApplication rec {
   version = "0.11.8";
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak=";
+  src = fetchFromGitHub {
+    owner = "sunpy";
+    repo = "ablog";
+    rev = "v${version}";
+    hash = "sha256-t3Vxw1IJoHuGqHv/0S4IoHwjWbtR6knXCBg4d0cM3lw=";
   };
 
   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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be39de7832ac..19b6da52820a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1501,8 +1501,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 { };

From 1e1685f116d30b0dcddc4e022cd2ee87d320493f Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 16 May 2024 13:04:30 -0300
Subject: [PATCH 2/2] ablog: 0.11.8 -> 0.11.10

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/ab/ablog/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ab/ablog/package.nix b/pkgs/by-name/ab/ablog/package.nix
index 791c8598868c..3221b16dcfcf 100644
--- a/pkgs/by-name/ab/ablog/package.nix
+++ b/pkgs/by-name/ab/ablog/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ablog";
-  version = "0.11.8";
+  version = "0.11.10";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "sunpy";
     repo = "ablog";
     rev = "v${version}";
-    hash = "sha256-t3Vxw1IJoHuGqHv/0S4IoHwjWbtR6knXCBg4d0cM3lw=";
+    hash = "sha256-8NyFLGtMJLUkojEhWpWNZz3zlfgGVgSvgk4dDEz1jzs=";
   };
 
   nativeBuildInputs = with python3.pkgs; [