From 4fcd1d39088163ad80e0682111949e22e9e17916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:30:14 +0200 Subject: [PATCH 1/4] fedifetcher: check if all requirements are there Until we have a proper wheel, we can check with that if all deps are there. https://github.com/nanos/FediFetcher/issues/177 --- pkgs/tools/misc/fedifetcher/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index a15b2c516edf..f141c713b165 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3, stdenv }: python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; @@ -26,6 +26,14 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + runHook preCheck + + $out/bin/fedifetcher --help>/dev/null + + runHook postCheck + ''; + meta = with lib; { description = "Tool for Mastodon that automatically fetches missing replies and posts from other fediverse instances"; longDescription = '' From 77f6d18c9edb6bbd545b1278dca032a28c464967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:30:39 +0200 Subject: [PATCH 2/4] fedifetcher: add meta.changelog --- pkgs/tools/misc/fedifetcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index f141c713b165..dbdf514dbb90 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -42,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { own Mastodon instance. ''; homepage = "https://blog.thms.uk/fedifetcher"; + changelog = "https://github.com/nanos/FediFetcher/releases/tag/v${version}"; license = licenses.mit; maintainers = teams.c3d2.members; mainProgram = "fedifetcher"; From d6b24c590f2e6441af7c8aa95965c793575cd2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:32:18 +0200 Subject: [PATCH 3/4] fedifetcher: add missing dep from last update --- pkgs/tools/misc/fedifetcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index dbdf514dbb90..91d39d4d1f27 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -16,6 +16,7 @@ python3.pkgs.buildPythonApplication rec { defusedxml python-dateutil requests + xxhash ]; installPhase = '' From 4f2836b69b950cb4d6055f318289a5cb99f4f8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:32:39 +0200 Subject: [PATCH 4/4] fedifetcher: 7.1.7 -> 7.1.12 Diff: https://github.com/nanos/FediFetcher/compare/refs/tags/v7.1.7...v7.1.12 Changelog: https://github.com/nanos/FediFetcher/releases/tag/v7.1.12 --- pkgs/tools/misc/fedifetcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index 91d39d4d1f27..4eac63989761 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.7"; + version = "7.1.12"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-1QLVhqyH0wb8om2pFJfmgJcYp9DTuT5KZpLy5InlRr8="; + hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40="; }; propagatedBuildInputs = with python3.pkgs; [