diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aa1d153b5c2a..85036857c4a4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4691,6 +4691,12 @@ githubId = 53847249; name = "Casey Avila"; }; + caspersonn = { + email = "lucakasper8@gmail.com"; + github = "Caspersonn"; + githubId = 96787412; + name = "Luca Kasper"; + }; cassandracomar = { name = "Cassandra Comar"; github = "cassandracomar"; diff --git a/pkgs/by-name/ji/jiratui/package.nix b/pkgs/by-name/ji/jiratui/package.nix index a9652114ab64..407fb5c1bafa 100644 --- a/pkgs/by-name/ji/jiratui/package.nix +++ b/pkgs/by-name/ji/jiratui/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "jiratui"; - version = "1.3.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "whyisdifficult"; repo = "jiratui"; tag = "v${finalAttrs.version}"; - hash = "sha256-b5bSMPnqHqpeFDl501gSun7G38OlhV/IMNMYXQT+j/4="; + hash = "sha256-yXVc3evYK3lbiLwn09M++lZfbb5F9bXSR5ge6Pfgs6w="; }; postPatch = '' @@ -32,19 +32,28 @@ python3Packages.buildPythonApplication (finalAttrs: { click gitpython httpx - pyaml + marklas + puremagic pydantic-settings python-dateutil python-json-logger - python-magic + pyyaml textual + textual-autocomplete textual-image + urllib3 xdg-base-dirs ] ++ textual.optional-dependencies.syntax; pythonRelaxDeps = [ "click" + "marklas" + # upstream wants puremagic >= 2.2.0 but only uses puremagic.magic_string, + # which is compatible with 1.x; drop once puremagic >= 2.2.0 lands + "puremagic" + "pydantic-settings" + "python-json-logger" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/marklas/default.nix b/pkgs/development/python-modules/marklas/default.nix new file mode 100644 index 000000000000..95722dc6a613 --- /dev/null +++ b/pkgs/development/python-modules/marklas/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + uv-build, + + # dependencies + mistune, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "marklas"; + version = "0.8.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "byExist"; + repo = "marklas"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vzjU1a/uWho9SpPO7RC3fgs3iXnh8BD3uCLTnZge2Po="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.21,<0.10.0" "uv_build>=0.9.21" + ''; + + build-system = [ uv-build ]; + + dependencies = [ mistune ]; + + pythonImportsCheck = [ "marklas" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Bidirectional converter between GitHub Flavored Markdown and Atlassian Document Format"; + homepage = "https://github.com/byExist/marklas"; + changelog = "https://github.com/byExist/marklas/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ caspersonn ]; + }; +}) diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix index a4f3bb38a68d..18ebf2edf298 100644 --- a/pkgs/development/python-modules/textual-image/default.nix +++ b/pkgs/development/python-modules/textual-image/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, # build-system - setuptools, + hatchling, # dependencies rich, @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "textual-image"; - version = "0.12.0"; + version = "0.13.2"; pyproject = true; __structuredAttrs = true; @@ -26,10 +26,10 @@ buildPythonPackage (finalAttrs: { owner = "lnqs"; repo = "textual-image"; tag = "v${finalAttrs.version}"; - hash = "sha256-W0f9ZnSZ58XqiPnr9SZEv22EE4yCsvXcgNA8eJebJQo="; + hash = "sha256-7TPng2rBYVY1r7Y1pkSZYo4r+MdyD8HzqJAMpzyNqZE="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ pillow diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae521dc418d2..0740d1eaa78b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10104,6 +10104,8 @@ self: super: with self; { markitdown = callPackage ../development/python-modules/markitdown { }; + marklas = callPackage ../development/python-modules/marklas { }; + marko = callPackage ../development/python-modules/marko { }; markuppy = callPackage ../development/python-modules/markuppy { };