diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 120f23fe97f..d334ce18395 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -42,7 +42,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "rich" ]; + pythonImportsCheck = [ + "rich" + ]; passthru.tests = { inherit enrich httpie rich-rst textual; diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 0b9c1f4984c..a7fb03e11ad 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -4,31 +4,38 @@ }: let - python = python3.override { - packageOverrides = self: super: { - rich = super.rich.overrideAttrs (old: rec { + py = python3.override { + packageOverrides = final: prev: { + rich = prev.rich.overridePythonAttrs (old: rec { version = "12.4.0"; src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v12.4.0"; hash = "sha256-ryJTusUNpvNF2031ICJWK8ScxHIh+LrXYg7nd0ph4aQ="; }; + propagatedBuildInputs = with py.pkgs; [ + commonmark + pygments + ]; + doCheck = false; }); - textual = super.textual.overrideAttrs (old: rec { + + textual = prev.textual.overridePythonAttrs (old: rec { version = "0.1.18"; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v0.1.18"; hash = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw="; }; + doCheck = false; }); }; }; in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "rich-cli"; version = "1.8.0"; format = "pyproject"; @@ -36,28 +43,28 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "Textualize"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ="; }; - nativeBuildInputs = with python.pkgs; [ - poetry-core - ]; - - propagatedBuildInputs = with python.pkgs; [ - rich - click - requests - textual - rich-rst - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace 'rich = "^12.4.0"' 'rich = "*"' \ --replace 'textual = "^0.1.18"' 'textual = "*"' ''; + nativeBuildInputs = with py.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with py.pkgs; [ + rich + click + requests + textual + rich-rst + ]; + pythonImportsCheck = [ "rich_cli" ]; @@ -65,6 +72,7 @@ python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command Line Interface to Rich"; homepage = "https://github.com/Textualize/rich-cli"; + changelog = "https://github.com/Textualize/rich-cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ joelkoen ]; };