From 4c37b4ae9c94260ab8c425323d3f19b3b4126f63 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:51:11 -0400 Subject: [PATCH] gitg: 3.30.1 -> 3.32.0 * adds libdazzle * intltool -> gettext * hicolor-icon-theme as native for setup-hook * re-enable tests https://gitlab.gnome.org/GNOME/gitg/blob/v3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/gitg/default.nix | 25 ++++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index cb4c5c05cb0..94703f375b2 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchurl , fetchpatch -, vala_0_42 -, intltool +, vala +, gettext , pkgconfig , gtk3 , glib @@ -24,34 +24,35 @@ , meson , ninja , python3 +, hicolor-icon-theme +, libdazzle }: stdenv.mkDerivation rec { pname = "gitg"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; + sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81"; }; patches = [ - # Fix build with latest libgit2-glib + # https://gitlab.gnome.org/GNOME/gitg/issues/213 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; - sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; + url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch"; + sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z"; }) ]; postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" ''; - doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + doCheck = true; enableParallelBuilding = true; @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { gtksourceview gtkspell3 json-glib + libdazzle libgee libgit2-glib libpeas @@ -72,12 +74,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - intltool + hicolor-icon-theme + gettext meson ninja pkgconfig python3 - vala_0_42 # fails build with 0.44, drop in >3.30.1 + vala wrapGAppsHook ];