-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge staging-next-24.05 into staging-24.05
- Loading branch information
Showing
10 changed files
with
118 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,58 @@ | ||
| { lib, fetchFromGitHub, python3Packages, nixosTests }: | ||
| { | ||
| lib, | ||
| fetchFromGitHub, | ||
| python3Packages, | ||
| nixosTests, | ||
| }: | ||
|
|
||
| python3Packages.buildPythonApplication rec { | ||
| pname = "toot"; | ||
| version = "0.42.0"; | ||
| version = "0.47.0"; | ||
| pyproject = true; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "ihabunek"; | ||
| repo = "toot"; | ||
| owner = "ihabunek"; | ||
| repo = "toot"; | ||
| rev = "refs/tags/${version}"; | ||
| sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU="; | ||
| hash = "sha256-TG98e/3X+bcNsx8ZR0Nv0VWlR/cJ7tzz46K7tYyoKsM="; | ||
| }; | ||
|
|
||
| nativeCheckInputs = with python3Packages; [ pytest ]; | ||
|
|
||
| propagatedBuildInputs = with python3Packages; | ||
| [ | ||
| requests beautifulsoup4 future wcwidth | ||
| urwid urwidgets psycopg2 tomlkit click | ||
| build-system = with python3Packages; [ | ||
| setuptools | ||
| setuptools-scm | ||
| ]; | ||
|
|
||
| dependencies = with python3Packages; [ | ||
| requests | ||
| beautifulsoup4 | ||
| wcwidth | ||
| urwid | ||
| urwidgets | ||
| tomlkit | ||
| click | ||
| pillow | ||
| term-image | ||
| ]; | ||
|
|
||
| checkPhase = '' | ||
| runHook preCheck | ||
| py.test | ||
| runHook postCheck | ||
| ''; | ||
|
|
||
| passthru.tests.toot = nixosTests.pleroma; | ||
|
|
||
| meta = with lib; { | ||
| meta = { | ||
| description = "Mastodon CLI interface"; | ||
| mainProgram = "toot"; | ||
| homepage = "https://github.com/ihabunek/toot"; | ||
| license = licenses.gpl3; | ||
| maintainers = [ maintainers.matthiasbeyer ]; | ||
| homepage = "https://github.com/ihabunek/toot"; | ||
| changelog = "https://github.com/ihabunek/toot/blob/refs/tags/${version}/CHANGELOG.md"; | ||
| license = lib.licenses.gpl3Only; | ||
| maintainers = with lib.maintainers; [ | ||
| matthiasbeyer | ||
| aleksana | ||
| ]; | ||
| }; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| { | ||
| lib, | ||
| buildPythonPackage, | ||
| fetchFromGitHub, | ||
| pythonOlder, | ||
| setuptools, | ||
| pillow, | ||
| requests, | ||
| urwid, | ||
| pytestCheckHook, | ||
| }: | ||
|
|
||
| buildPythonPackage rec { | ||
| pname = "term-image"; | ||
| version = "0.7.2"; | ||
| pyproject = true; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "AnonymouX47"; | ||
| repo = "term-image"; | ||
| rev = "refs/tags/v${version}"; | ||
| hash = "sha256-uA04KHKLXW0lx1y5brpCDARLac4/C8VmVinVMkEtTdM="; | ||
| }; | ||
|
|
||
| build-system = [ | ||
| setuptools | ||
| ]; | ||
|
|
||
| dependencies = [ | ||
| requests | ||
| pillow | ||
| ]; | ||
|
|
||
| optional-dependencies = { | ||
| urwid = [ urwid ]; | ||
| }; | ||
|
|
||
| nativeCheckInputs = [ | ||
| pytestCheckHook | ||
| ] ++ optional-dependencies.urwid; | ||
|
|
||
| disabledTestPaths = [ | ||
| # test_url needs online access | ||
| "tests/test_image/test_url.py" | ||
| ]; | ||
|
|
||
| pythonImportsCheck = [ "term_image" ]; | ||
|
|
||
| meta = { | ||
| description = "Display images in the terminal with python"; | ||
| homepage = "https://github.com/AnonymouX47/term-image"; | ||
| changelog = "https://github.com/AnonymouX47/term-image/releases/tag/v${version}"; | ||
| license = lib.licenses.mit; | ||
| maintainers = with lib.maintainers; [ liff ]; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters