From 5fcc66e6408e7496ec65cde2273d21c91aa5a26e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 Mar 2025 23:23:53 +0000 Subject: [PATCH] =?UTF-8?q?gnome-usage:=2046.0=20=E2=86=92=2048.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-usage/-/compare/46.0...48.rc Introduces an optional runtime dependency on `vnstat` program. Not hardcoding that path since it does not work without a daemon anyway. Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-usage/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gn/gnome-usage/package.nix b/pkgs/by-name/gn/gnome-usage/package.nix index 8be45e278654..059aadd85b82 100644 --- a/pkgs/by-name/gn/gnome-usage/package.nix +++ b/pkgs/by-name/gn/gnome-usage/package.nix @@ -12,20 +12,22 @@ wrapGAppsHook4, glib, gtk4, + json-glib, libadwaita, libgee, libgtop, + networkmanager, gnome, tinysparql, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-usage"; - version = "46.0"; + version = "48.rc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-GGrajgAYjIn4yrVPNZmO2XpG6rb9shiRAoNhvzhqybI="; + url = "mirror://gnome/sources/gnome-usage/${lib.versions.major finalAttrs.version}/gnome-usage-${finalAttrs.version}.tar.xz"; + hash = "sha256-LUbc2QcKkY/sMUdxaaQDI2CdCFa5XHo3wBusqULTk+w="; }; nativeBuildInputs = [ @@ -42,9 +44,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk4 + json-glib libadwaita libgee libgtop + networkmanager tinysparql ]; @@ -55,7 +59,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-usage"; }; }; @@ -67,4 +71,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; teams = [ teams.gnome ]; }; -} +})