diff options
| author | Luflosi <luflosi@luflosi.de> | 2024-04-05 16:33:49 +0200 |
|---|---|---|
| committer | Maxine Aubrey <35892750+amaxine@users.noreply.github.com> | 2024-04-16 13:44:12 +0000 |
| commit | f1901cf020675e0e9efde6a6c43ffea738700982 (patch) | |
| tree | 2ae5c136f65ba4aba694af5d6d936cd65a2d9b96 /pkgs/desktops/gnome | |
| parent | 8b6390147409737dff5821c1677529a94e5b457f (diff) | |
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`
Diffstat (limited to 'pkgs/desktops/gnome')
| -rw-r--r-- | pkgs/desktops/gnome/misc/gitg/default.nix | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix index d454a26058930..df722bc868eda 100644 --- a/pkgs/desktops/gnome/misc/gitg/default.nix +++ b/pkgs/desktops/gnome/misc/gitg/default.nix @@ -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; }; |