Merge pull request #171533 from fabaff/textual-bump
python310Packages.textual: 0.1.15 -> 0.1.18, rich-cli: 1.5.1 -> 1.7.0
This commit is contained in:
commit
39cdd05c72
|
@ -1,38 +1,34 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, poetry-core
|
, poetry-core
|
||||||
, rich
|
, rich
|
||||||
, typing-extensions
|
, typing-extensions
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "textual";
|
pname = "textual";
|
||||||
version = "0.1.15";
|
version = "0.1.18";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Textualize";
|
owner = "Textualize";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6";
|
sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
nativeBuildInputs = [
|
||||||
(fetchpatch {
|
poetry-core
|
||||||
# v0.1.15 git tag has 0.1.14 in pyproject.toml
|
|
||||||
name = "version.patch";
|
|
||||||
url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch";
|
|
||||||
sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ poetry-core ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
rich
|
rich
|
||||||
|
] ++ lib.optionals (pythonOlder "3.9") [
|
||||||
typing-extensions
|
typing-extensions
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -40,7 +36,14 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "textual" ];
|
postPatch = ''
|
||||||
|
substituteInPlace pyproject.toml \
|
||||||
|
--replace 'rich = "^12.3.0"' 'rich = "*"'
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"textual"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "TUI framework for Python inspired by modern web development";
|
description = "TUI framework for Python inspired by modern web development";
|
||||||
|
|
|
@ -1,17 +1,20 @@
|
||||||
{ lib, python3 }:
|
{ lib
|
||||||
|
, python3
|
||||||
|
}:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "rich-cli";
|
pname = "rich-cli";
|
||||||
version = "1.5.1";
|
version = "1.7.0";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
src = python3.pkgs.fetchPypi {
|
src = python3.pkgs.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k";
|
sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
format = "pyproject";
|
nativeBuildInputs = with python3.pkgs; [
|
||||||
|
poetry-core
|
||||||
nativeBuildInputs = [ python3.pkgs.poetry-core ];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
rich
|
rich
|
||||||
|
@ -21,11 +24,18 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
rich-rst
|
rich-rst
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ python3 ];
|
postPatch = ''
|
||||||
|
substituteInPlace pyproject.toml \
|
||||||
|
--replace 'rich = "^12.3.0"' 'rich = "*"'
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"rich_cli"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/Textualize/rich-cli";
|
|
||||||
description = "Command Line Interface to Rich";
|
description = "Command Line Interface to Rich";
|
||||||
|
homepage = "https://github.com/Textualize/rich-cli";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jyooru ];
|
maintainers = with maintainers; [ jyooru ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue