Merge #161856: gaphor: 2.6.5 -> 2.8.2

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