From 20d0500abd6306421f34ed431eec60c86329e0f7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 1 Apr 2022 03:05:13 +0000 Subject: [PATCH 1/5] =?UTF-8?q?gnome.aisleriot:=203.22.21=20=E2=86=92=203.?= =?UTF-8?q?22.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/aisleriot/-/compare/3.22.21...3.22.22 --- pkgs/desktops/gnome/games/aisleriot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 5a7446862bd..953a40623c0 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -10,7 +10,7 @@ , librsvg , libxml2 , desktop-file-utils -, guile_3_0 +, guile , libcanberra-gtk3 , ninja , appstream-glib @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.21"; + version = "3.22.22"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-dpzuePxSoJcwUlj314r5G9A8aF1Yz49r+DxNTfA8/Ks="; + sha256 = "sha256-Jr4XEj6h+gI1gNqoJ/cJ3cDBB4mSbpzvOUQkwGxkLPs="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg - guile_3_0 + guile libcanberra-gtk3 ]; From 57d754ee3c5e9c44679d8ae868ffd9c34601aa5e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 1 Apr 2022 11:17:53 +0800 Subject: [PATCH 2/5] gnome.five-or-more: format with nixpkgs-fmt --- .../gnome/games/five-or-more/default.nix | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix index f01d137979e..072c5e81712 100644 --- a/pkgs/desktops/gnome/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gtk3, wrapGAppsHook -, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, libgnome-games-support +, gettext +, itstool +, libxml2 +, python3 +, vala +}: stdenv.mkDerivation rec { pname = "five-or-more"; @@ -11,11 +26,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkg-config gettext itstool libxml2 python3 wrapGAppsHook + meson + ninja + pkg-config + gettext + itstool + libxml2 + python3 + wrapGAppsHook vala ]; + buildInputs = [ - gtk3 librsvg libgnome-games-support gnome.adwaita-icon-theme + gtk3 + librsvg + libgnome-games-support + gnome.adwaita-icon-theme ]; postPatch = '' From 524c463486410271b1a6e0bde8a841fb1d4b7dbe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 1 Apr 2022 03:18:41 +0000 Subject: [PATCH 3/5] =?UTF-8?q?gnome.five-or-more:=203.32.2=20=E2=86=92=20?= =?UTF-8?q?3.32.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/five-or-more/-/compare/3.32.2...3.32.3 --- pkgs/desktops/gnome/games/five-or-more/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix index 072c5e81712..ce532d1d5cd 100644 --- a/pkgs/desktops/gnome/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "five-or-more"; - version = "3.32.2"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii"; + sha256 = "LRDXLu/esyS0R9YyrwwySW4l/BWjwB230vAMm1HQnvQ="; }; nativeBuildInputs = [ @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { gtk3 librsvg libgnome-games-support - gnome.adwaita-icon-theme ]; postPatch = '' From 79cccf419b549df732b9c024c85d1ca421161754 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 1 Apr 2022 03:25:54 +0000 Subject: [PATCH 4/5] =?UTF-8?q?gnome.gucharmap:=2014.0.2=20=E2=86=92=2014.?= =?UTF-8?q?0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gucharmap/-/compare/14.0.2...14.0.3 --- pkgs/desktops/gnome/core/gucharmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 3dc08e66357..dbea63db4a3 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "14.0.2"; + version = "14.0.3"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-gyOm/S0ae0kX4AFUiglqyGRGB8C/KUuaG/dr/Wf1ug0="; + sha256 = "sha256-xO34CR+SWxtHuP6G8m0jla0rivVp3ddrsODNo50MhHw="; }; nativeBuildInputs = [ From c167b827b5dabe47f8469603e13c74b693255212 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 1 Apr 2022 14:22:50 +0000 Subject: [PATCH 5/5] =?UTF-8?q?gnome.sushi:=2041.0=20=E2=86=92=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sushi/-/compare/41.0...41.1 --- pkgs/desktops/gnome/core/sushi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 00ac8e40aad..4c6f960d8c8 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "41.0"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "m3UlaQzkNmJO+gpgV3NJNDLNDva49GSYLouETtqYmO4="; + sha256 = "JifbYWLnV3hZDAfhZbLzbqJNEjGlE7FkAj/G3fx1xKM="; }; nativeBuildInputs = [