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 { };