Skip to content

Commit 2901476

Browse files
committed
gaphor: 2.8.2 -> 2.26.0
1 parent 503bea4 commit 2901476

File tree

1 file changed

+33
-17
lines changed

1 file changed

+33
-17
lines changed

pkgs/tools/misc/gaphor/default.nix

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,67 @@
44
, copyDesktopItems
55
, gobject-introspection
66
, poetry-core
7-
, wrapGAppsHook3
8-
, gtksourceview4
7+
, wrapGAppsHook4
8+
, gtksourceview5
9+
, libadwaita
910
, pango
1011
, gaphas
1112
, generic
1213
, jedi
1314
, pycairo
15+
, pillow
16+
, dulwich
17+
, pydot
18+
, defusedxml
19+
, better-exceptions
20+
, babel
1421
, pygobject3
1522
, tinycss2
16-
, gtk3
23+
, gtk4
1724
, librsvg
1825
, makeDesktopItem
1926
, python
2027
}:
2128

2229
buildPythonApplication rec {
2330
pname = "gaphor";
24-
version = "2.8.2";
25-
26-
format = "pyproject";
31+
version = "2.26.0";
32+
pyproject = true;
2733

2834
src = fetchPypi {
2935
inherit pname version;
30-
hash = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0=";
36+
hash = "sha256-e0K5bfgPqlJh8qrAz40c/w3ANzkfa/6txuqzQDJYXfE=";
3137
};
3238

39+
pythonRelaxDeps = [ "defusedxml" ];
40+
3341
nativeBuildInputs = [
3442
copyDesktopItems
3543
gobject-introspection
36-
poetry-core
37-
wrapGAppsHook3
44+
wrapGAppsHook4
3845
];
3946

4047
buildInputs = [
41-
gtksourceview4
48+
gtksourceview5
4249
pango
50+
libadwaita
4351
];
4452

45-
propagatedBuildInputs = [
46-
gaphas
47-
generic
48-
jedi
53+
build-system = [ poetry-core ];
54+
55+
dependencies = [
4956
pycairo
5057
pygobject3
58+
gaphas
59+
generic
5160
tinycss2
61+
babel
62+
jedi
63+
better-exceptions
64+
pydot
65+
pillow
66+
defusedxml
67+
dulwich
5268
];
5369

5470
desktopItems = makeDesktopItem {
@@ -59,7 +75,7 @@ buildPythonApplication rec {
5975
desktopName = "Gaphor";
6076
};
6177

62-
# Disable automatic wrapGAppsHook3 to prevent double wrapping
78+
# Disable automatic wrapGAppsHook4 to prevent double wrapping
6379
dontWrapGApps = true;
6480

6581
postInstall = ''
@@ -69,7 +85,7 @@ buildPythonApplication rec {
6985
preFixup = ''
7086
makeWrapperArgs+=(
7187
"''${gappsWrapperArgs[@]}" \
72-
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
88+
--prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}/" \
7389
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
7490
)
7591
'';
@@ -79,6 +95,6 @@ buildPythonApplication rec {
7995
maintainers = [ ];
8096
homepage = "https://github.com/gaphor/gaphor";
8197
license = licenses.asl20;
82-
platforms = [ "x86_64-linux" ];
98+
platforms = lib.platforms.linux;
8399
};
84100
}

0 commit comments

Comments
 (0)