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
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
|
||||||
, vala
|
, vala
|
||||||
, gettext
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, gtk3
|
, gtk3
|
||||||
, glib
|
, glib
|
||||||
|
, gpgme
|
||||||
, json-glib
|
, json-glib
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, libpeas
|
, libpeas
|
||||||
|
@ -14,12 +13,13 @@
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, gtksourceview4
|
, gtksourceview4
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, adwaita-icon-theme
|
|
||||||
, gnome
|
, gnome
|
||||||
, gspell
|
, gspell
|
||||||
|
, gvfs
|
||||||
, shared-mime-info
|
, shared-mime-info
|
||||||
, libgee
|
, libgee
|
||||||
, libgit2-glib
|
, libgit2-glib
|
||||||
|
, libhandy
|
||||||
, libsecret
|
, libsecret
|
||||||
, libxml2
|
, libxml2
|
||||||
, meson
|
, meson
|
||||||
|
@ -30,25 +30,15 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gitg";
|
pname = "gitg";
|
||||||
version = "41";
|
version = "44";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
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 = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
gettext
|
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -58,28 +48,29 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
adwaita-icon-theme
|
|
||||||
glib
|
glib
|
||||||
|
gpgme
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gtk3
|
gtk3
|
||||||
gtksourceview4
|
gtksourceview4
|
||||||
gspell
|
gspell
|
||||||
|
gvfs
|
||||||
json-glib
|
json-glib
|
||||||
libdazzle
|
libdazzle
|
||||||
libgee
|
libgee
|
||||||
libgit2-glib
|
libgit2-glib
|
||||||
|
libhandy
|
||||||
libpeas
|
libpeas
|
||||||
libsecret
|
libsecret
|
||||||
libxml2
|
libxml2
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
|
doCheck = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x meson_post_install.py
|
|
||||||
patchShebangs 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 = ''
|
preFixup = ''
|
||||||
|
@ -95,11 +86,13 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://wiki.gnome.org/Apps/Gitg";
|
homepage = "https://wiki.gnome.org/Apps/Gitg";
|
||||||
description = "GNOME GUI client to view git repositories";
|
description = "GNOME GUI client to view git repositories";
|
||||||
mainProgram = "gitg";
|
mainProgram = "gitg";
|
||||||
maintainers = with maintainers; [ domenkozar ];
|
maintainers = with maintainers; [ domenkozar Luflosi ];
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user