Merge #161856: gaphor: 2.6.5 -> 2.8.2

+31 -10
+31 -10
pkgs/tools/misc/gaphor/default.nix
··· 1 1 { lib 2 2 , buildPythonApplication 3 3 , fetchPypi 4 - , poetry-core 4 + , copyDesktopItems 5 5 , gobject-introspection 6 - , pango 6 + , poetry-core 7 + , wrapGAppsHook 7 8 , gtksourceview4 8 - , wrapGAppsHook 9 - , makeDesktopItem 10 - , copyDesktopItems 9 + , pango 11 10 , gaphas 12 11 , generic 12 + , jedi 13 13 , pycairo 14 14 , pygobject3 15 + , tinycss2 16 + , gtk3 17 + , librsvg 18 + , makeDesktopItem 15 19 , python 16 - , tinycss2 17 20 }: 18 21 19 22 buildPythonApplication rec { 20 23 pname = "gaphor"; 21 - version = "2.6.5"; 24 + version = "2.8.2"; 22 25 23 26 format = "pyproject"; 24 27 25 28 src = fetchPypi { 26 29 inherit pname version; 27 - sha256 = "sha256-IFsbWx5lblKsnEibVihM6ZPRoydXC+JM1gdZEUUTKxw="; 30 + sha256 = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0="; 28 31 }; 29 32 30 33 nativeBuildInputs = [ 31 - poetry-core copyDesktopItems gobject-introspection wrapGAppsHook 34 + copyDesktopItems 35 + gobject-introspection 36 + poetry-core 37 + wrapGAppsHook 32 38 ]; 33 39 34 40 # Setting gobject-introspection on booth nativeBuildInputs and 35 41 # buildInputs because of #56943. This recognizes pango, avoiding 36 42 # a "ValueError: Namespace PangoCairo not available". 37 - buildInputs = [ gobject-introspection gtksourceview4 pango ]; 43 + buildInputs = [ 44 + gobject-introspection 45 + gtksourceview4 46 + pango 47 + ]; 38 48 39 49 propagatedBuildInputs = [ 40 50 gaphas 41 51 generic 52 + jedi 42 53 pycairo 43 54 pygobject3 44 55 tinycss2 ··· 52 63 desktopName = "Gaphor"; 53 64 }; 54 65 66 + # We need to wrap it manually to resolve all icons 67 + dontWrapGApps = true; 68 + 55 69 postInstall = '' 56 70 install -Dm644 $out/${python.sitePackages}/gaphor/ui/icons/hicolor/scalable/apps/org.gaphor.Gaphor.svg $out/share/pixmaps/gaphor.svg 71 + ''; 72 + 73 + preFixup = '' 74 + wrapProgram $out/bin/gaphor \ 75 + ''${gappsWrapperArgs[@]} \ 76 + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ 77 + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" 57 78 ''; 58 79 59 80 meta = with lib; {