From d6966c3ef22eb2bfbb4c72600fc85ad74deb7a9a Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Tue, 22 Jul 2025 08:10:25 +0200 Subject: [PATCH] haxor-news: unstable-2020-10-20 -> unstable-2022-04-22 Package was not building with error, I removed the manual package overrides and it built fine. Also updated to the most recent unstable commit afterwards. From what I tested it seems to work fine. ``` error: builder for '/nix/store/15l75w52cxc77zwdqv2w41cz0sylky0q-python3.13-prompt-toolkit-1.0.18.drv' failed with exit code 1; last 21 log lines: > Sourcing python-remove-tests-dir-hook > Sourcing python-catch-conflicts-hook.sh > Sourcing python-remove-bin-bytecode-hook.sh > Sourcing pypa-build-hook > Using pypaBuildPhase > Sourcing python-runtime-deps-check-hook > Using pythonRuntimeDepsCheckHook > Sourcing pypa-install-hook > Using pypaInstallPhase > Sourcing python-imports-check-hook.sh > Using pythonImportsCheckPhase > Sourcing python-namespaces-hook > Sourcing python-catch-conflicts-hook.sh > Sourcing pytest-check-hook > Using pytestCheckPhase > Running phase: unpackPhase > unpacking source archive /nix/store/hxiafm537za17sivpcljvqr6qlsclc8n-prompt_toolkit-1.0.18.tar.gz > source root is prompt_toolkit-1.0.18 > setting SOURCE_DATE_EPOCH to timestamp 1570133629 of file "prompt_toolkit-1.0.18/setup.cfg" > Running phase: patchPhase > substitute(): ERROR: file 'src/prompt_toolkit/__init__.py' does not exist For full logs, run: nix log /nix/store/15l75w52cxc77zwdqv2w41cz0sylky0q-python3.13-prompt-toolkit-1.0.18.drv ``` --- pkgs/by-name/ha/haxor-news/package.nix | 42 +++++--------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/ha/haxor-news/package.nix b/pkgs/by-name/ha/haxor-news/package.nix index c0923839d41b..d57a43d20c95 100644 --- a/pkgs/by-name/ha/haxor-news/package.nix +++ b/pkgs/by-name/ha/haxor-news/package.nix @@ -2,51 +2,23 @@ lib, fetchFromGitHub, fetchPypi, - python3, + python3Packages, }: -let - py = python3.override { - self = py; - packageOverrides = self: super: { - # not compatible with prompt_toolkit >=2.0 - prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "1.0.18"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-3U/KAsgGlJetkxotCZFMaw0bUBUc6Ha8Fb3kx0cJASY="; - }; - }); - # Use click 7 - click = super.click.overridePythonAttrs (old: rec { - version = "7.1.2"; - src = fetchPypi { - pname = "click"; - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - disabledTests = [ "test_bytes_args" ]; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "haxor-news"; - version = "unstable-2020-10-20"; + version = "unstable-2022-04-22"; format = "setuptools"; # haven't done a stable release in 3+ years, but actively developed src = fetchFromGitHub { owner = "donnemartin"; repo = "haxor-news"; - rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f"; - hash = "sha256-5v61b49ttwqPOvtoykJBBzwVSi7S8ARlakccMr12bbw="; + rev = "8294e4498858f036a344b06e82f08b834c2a8270"; + hash = "sha256-0eVk5zj7F3QDFvV0Kv9aeV1oeKxr/Kza6M3pK6hyYuY="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ click colorama requests @@ -58,7 +30,7 @@ buildPythonApplication rec { # will fail without pre-seeded config files doCheck = false; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ unittestCheckHook mock ];