gitg: 41 -> 44
https://download.gnome.org/sources/gitg/44/gitg-44.news Also: - Add myself as a maintainer - Enable `strictDeps` - Run the tests again since they now work - Use `--replace-fail` instead of `--replace` for `substituteInPlace`
This commit is contained in:
parent
8b63901474
commit
f1901cf020
@ -1,12 +1,11 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, vala
|
||||
, gettext
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, glib
|
||||
, gpgme
|
||||
, json-glib
|
||||
, wrapGAppsHook
|
||||
, libpeas
|
||||
@ -14,12 +13,13 @@
|
||||
, gobject-introspection
|
||||
, gtksourceview4
|
||||
, gsettings-desktop-schemas
|
||||
, adwaita-icon-theme
|
||||
, gnome
|
||||
, gspell
|
||||
, gvfs
|
||||
, shared-mime-info
|
||||
, libgee
|
||||
, libgit2-glib
|
||||
, libhandy
|
||||
, libsecret
|
||||
, libxml2
|
||||
, meson
|
||||
@ -30,25 +30,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitg";
|
||||
version = "41";
|
||||
version = "44";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "f7Ybn7EPuqVI0j1wZbq9cq1j5iHeVYQMBlzm45hsRik=";
|
||||
hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# data/meson.build:8:5: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636.patch";
|
||||
sha256 = "sha256-RzaGPGGiKMgjy0waFqt48rV2yWBGZgC3kHehhVhxktk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
@ -58,28 +48,29 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
adwaita-icon-theme
|
||||
glib
|
||||
gpgme
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
gtksourceview4
|
||||
gspell
|
||||
gvfs
|
||||
json-glib
|
||||
libdazzle
|
||||
libgee
|
||||
libgit2-glib
|
||||
libhandy
|
||||
libpeas
|
||||
libsecret
|
||||
libxml2
|
||||
];
|
||||
|
||||
doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
|
||||
substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
|
||||
substituteInPlace tests/libgitg/test-commit.vala --replace-fail "/bin/bash" "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
@ -95,11 +86,13 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Gitg";
|
||||
description = "GNOME GUI client to view git repositories";
|
||||
mainProgram = "gitg";
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
maintainers = with maintainers; [ domenkozar Luflosi ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user