diff options
| -rw-r--r-- | maintainers/team-list.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/apps/gnome-logs/default.nix | 23 |
2 files changed, 9 insertions, 15 deletions
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index bf4fcc6a4a7d0..66cba166f2cae 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -117,6 +117,7 @@ with lib.maintainers; { gnome = { members = [ + bobby285271 hedning jtojnar dasj19 diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index da06eb4404c11..16d487867b8f7 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -10,6 +10,7 @@ , wrapGAppsHook , gettext , itstool +, libhandy , libxml2 , libxslt , docbook_xsl @@ -21,21 +22,13 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.36.0"; + version = "42.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4"; + url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch"; - sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n"; - }) - ]; - nativeBuildInputs = [ python3 meson @@ -53,9 +46,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 + libhandy systemd gsettings-desktop-schemas - gnome.adwaita-icon-theme ]; mesonFlags = [ @@ -80,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Logs"; description = "A log viewer for the systemd journal"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } |