git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #171533 from fabaff/textual-bump

python310Packages.textual: 0.1.15 -> 0.1.18, rich-cli: 1.5.1 -> 1.7.0

commit39cdd05c72d14bb532e2ae27c27df726e4ad294d authorFabian Affolter <fabian@affolter-engineering.ch> dateThu 5 May 2022, 08:07 (5 years ago) parent2fb40c02efd109
2 files changed+34−21
compare with master
unifiedsplit
pkgs/development/python-modules/textual/default.nix+16−13 pkgs/misc/rich-cli/default.nix+18−8
pkgs/development/python-modules/textual/default.nix+16−13
@@ -1,38 +1,34 @@
11{ lib
22, buildPythonPackage
33, fetchFromGitHub
4−, fetchpatch
54, poetry-core
65, rich
76, typing-extensions
87, pytestCheckHook
8+, pythonOlder
99}:
1010
1111buildPythonPackage rec {
1212 pname = "textual";
13− version = "0.1.15";
13+ version = "0.1.18";
1414 format = "pyproject";
1515
16+ disabled = pythonOlder "3.7";
17+
1618 src = fetchFromGitHub {
1719 owner = "Textualize";
1820 repo = pname;
1921 rev = "v${version}";
20− sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6";
22+ sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";
2123 };
2224
23− patches = [
24− (fetchpatch {
25− # v0.1.15 git tag has 0.1.14 in pyproject.toml
26− name = "version.patch";
27− url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch";
28− sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp";
29− })
25+ nativeBuildInputs = [
26+ poetry-core
3027 ];
3128
32− nativeBuildInputs = [ poetry-core ];
33−
3429 propagatedBuildInputs = [
3530 rich
31+ ] ++ lib.optionals (pythonOlder "3.9") [
3632 typing-extensions
3733 ];
3834
@@ -40,7 +36,14 @@ buildPythonPackage rec {
4036 pytestCheckHook
4137 ];
4238
43− pythonImportsCheck = [ "textual" ];
39+ postPatch = ''
40+ substituteInPlace pyproject.toml \
41+ --replace 'rich = "^12.3.0"' 'rich = "*"'
42+ '';
43+
44+ pythonImportsCheck = [
45+ "textual"
46+ ];
4447
4548 meta = with lib; {
4649 description = "TUI framework for Python inspired by modern web development";
pkgs/misc/rich-cli/default.nix+18−8
@@ -1,17 +1,20 @@
1−{ lib, python3 }:
1+{ lib
2+, python3
3+}:
24
35python3.pkgs.buildPythonApplication rec {
46 pname = "rich-cli";
5− version = "1.5.1";
7+ version = "1.7.0";
8+ format = "pyproject";
69
710 src = python3.pkgs.fetchPypi {
811 inherit pname version;
9− sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k";
12+ sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";
1013 };
1114
12− format = "pyproject";
13−
14− nativeBuildInputs = [ python3.pkgs.poetry-core ];
15+ nativeBuildInputs = with python3.pkgs; [
16+ poetry-core
17+ ];
1518
1619 propagatedBuildInputs = with python3.pkgs; [
1720 rich
@@ -21,11 +24,18 @@ python3.pkgs.buildPythonApplication rec {
2124 rich-rst
2225 ];
2326
24− buildInputs = [ python3 ];
27+ postPatch = ''
28+ substituteInPlace pyproject.toml \
29+ --replace 'rich = "^12.3.0"' 'rich = "*"'
30+ '';
31+
32+ pythonImportsCheck = [
33+ "rich_cli"
34+ ];
2535
2636 meta = with lib; {
27− homepage = "https://github.com/Textualize/rich-cli";
2837 description = "Command Line Interface to Rich";
38+ homepage = "https://github.com/Textualize/rich-cli";
2939 license = licenses.mit;
3040 maintainers = with maintainers; [ jyooru ];
3141 };