diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index f63d9f808d95..0c6ba902535d 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,15 +23,15 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.72.0"; + version = "1.76.1"; pyproject = false; src = fetchFromGitea { domain = "codeberg.org"; owner = "valos"; repo = "Komikku"; - rev = "v${version}"; - hash = "sha256-Kdt4nEWdxfZB7rmPbCegbj4abfv1nMSvAAC6mmUcv44="; + tag = "v${version}"; + hash = "sha256-js9mywNlv13ZDmvoBt9yuXJePaSuKOimek3uNlVIeHM="; }; nativeBuildInputs = [ @@ -54,14 +54,14 @@ python3.pkgs.buildPythonApplication rec { webkitgtk_6_0 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 brotli - colorthief dateparser emoji keyring lxml + modern-colorthief natsort piexif pillow @@ -92,12 +92,7 @@ python3.pkgs.buildPythonApplication rec { # Prevent double wrapping. dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - ) - ''; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/modern-colorthief/default.nix b/pkgs/development/python-modules/modern-colorthief/default.nix new file mode 100644 index 000000000000..52932819ae48 --- /dev/null +++ b/pkgs/development/python-modules/modern-colorthief/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + colorthief, + fetchFromGitHub, + nix-update-script, + pillow, + pytestCheckHook, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "modern-colorthief"; + version = "0.1.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "baseplate-admin"; + repo = "modern_colorthief"; + tag = version; + hash = "sha256-tALF9EIBTyVi3Ca4kQl9x+V12gjr0xH9OOmuoToxuJA="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-DldfoDpE7epb99Huq0RXkS3cAw0RtIzdWvr9OuZRZTI="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + optional-dependencies = { + test = [ + colorthief + pillow + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.attrValues optional-dependencies; + + disabledTestPaths = [ + # Requires `fast_colorthief`, which isn't packaged + "examples/test_time.py" + ]; + + pythonImportsCheck = [ "modern_colorthief" ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://modern-colorthief.readthedocs.io/"; + changelog = "https://github.com/baseplate-admin/modern_colorthief/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d7487070cd8..bb1251370fcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9059,6 +9059,8 @@ self: super: with self; { modeled = callPackage ../development/python-modules/modeled { }; + modern-colorthief = callPackage ../development/python-modules/modern-colorthief { }; + moderngl = callPackage ../development/python-modules/moderngl { }; moderngl-window = callPackage ../development/python-modules/moderngl-window { };