Skip to content

Commit f5ff6a9

Browse files
authored
komikku: 1.72.0 -> 1.76.1 (#394181)
2 parents 060827d + 7a74058 commit f5ff6a9

File tree

3 files changed

+68
-11
lines changed

3 files changed

+68
-11
lines changed

pkgs/by-name/ko/komikku/package.nix

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424
python3.pkgs.buildPythonApplication rec {
2525
pname = "komikku";
26-
version = "1.72.0";
26+
version = "1.76.1";
2727
pyproject = false;
2828

2929
src = fetchFromGitea {
3030
domain = "codeberg.org";
3131
owner = "valos";
3232
repo = "Komikku";
33-
rev = "v${version}";
34-
hash = "sha256-Kdt4nEWdxfZB7rmPbCegbj4abfv1nMSvAAC6mmUcv44=";
33+
tag = "v${version}";
34+
hash = "sha256-js9mywNlv13ZDmvoBt9yuXJePaSuKOimek3uNlVIeHM=";
3535
};
3636

3737
nativeBuildInputs = [
@@ -54,14 +54,14 @@ python3.pkgs.buildPythonApplication rec {
5454
webkitgtk_6_0
5555
];
5656

57-
propagatedBuildInputs = with python3.pkgs; [
57+
dependencies = with python3.pkgs; [
5858
beautifulsoup4
5959
brotli
60-
colorthief
6160
dateparser
6261
emoji
6362
keyring
6463
lxml
64+
modern-colorthief
6565
natsort
6666
piexif
6767
pillow
@@ -92,12 +92,7 @@ python3.pkgs.buildPythonApplication rec {
9292

9393
# Prevent double wrapping.
9494
dontWrapGApps = true;
95-
96-
preFixup = ''
97-
makeWrapperArgs+=(
98-
"''${gappsWrapperArgs[@]}"
99-
)
100-
'';
95+
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
10196

10297
passthru = {
10398
updateScript = nix-update-script { };
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
lib,
3+
buildPythonPackage,
4+
colorthief,
5+
fetchFromGitHub,
6+
nix-update-script,
7+
pillow,
8+
pytestCheckHook,
9+
rustPlatform,
10+
}:
11+
12+
buildPythonPackage rec {
13+
pname = "modern-colorthief";
14+
version = "0.1.7";
15+
pyproject = true;
16+
17+
src = fetchFromGitHub {
18+
owner = "baseplate-admin";
19+
repo = "modern_colorthief";
20+
tag = version;
21+
hash = "sha256-tALF9EIBTyVi3Ca4kQl9x+V12gjr0xH9OOmuoToxuJA=";
22+
};
23+
24+
cargoDeps = rustPlatform.fetchCargoVendor {
25+
inherit pname version src;
26+
hash = "sha256-DldfoDpE7epb99Huq0RXkS3cAw0RtIzdWvr9OuZRZTI=";
27+
};
28+
29+
nativeBuildInputs = [
30+
rustPlatform.cargoSetupHook
31+
rustPlatform.maturinBuildHook
32+
];
33+
34+
optional-dependencies = {
35+
test = [
36+
colorthief
37+
pillow
38+
];
39+
};
40+
41+
nativeCheckInputs = [ pytestCheckHook ] ++ lib.attrValues optional-dependencies;
42+
43+
disabledTestPaths = [
44+
# Requires `fast_colorthief`, which isn't packaged
45+
"examples/test_time.py"
46+
];
47+
48+
pythonImportsCheck = [ "modern_colorthief" ];
49+
50+
passthru = {
51+
updateScript = nix-update-script { };
52+
};
53+
54+
meta = {
55+
homepage = "https://modern-colorthief.readthedocs.io/";
56+
changelog = "https://github.com/baseplate-admin/modern_colorthief/releases/tag/${src.tag}";
57+
license = lib.licenses.mit;
58+
maintainers = with lib.maintainers; [ getchoo ];
59+
};
60+
}

pkgs/top-level/python-packages.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9059,6 +9059,8 @@ self: super: with self; {
90599059

90609060
modeled = callPackage ../development/python-modules/modeled { };
90619061

9062+
modern-colorthief = callPackage ../development/python-modules/modern-colorthief { };
9063+
90629064
moderngl = callPackage ../development/python-modules/moderngl { };
90639065

90649066
moderngl-window = callPackage ../development/python-modules/moderngl-window { };

0 commit comments

Comments
 (0)