Merge pull request #166754 from bobby285271/gnome

GNOME updates 2022-04-01
This commit is contained in:
Bobby Rong 2022-04-02 12:23:36 +08:00 committed by GitHub
commit d0f3fa1910
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 14 deletions

View file

@ -45,7 +45,7 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gucharmap"; pname = "gucharmap";
version = "14.0.2"; version = "14.0.3";
outputs = [ "out" "lib" "dev" "devdoc" ]; outputs = [ "out" "lib" "dev" "devdoc" ];
@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
owner = "GNOME"; owner = "GNOME";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-gyOm/S0ae0kX4AFUiglqyGRGB8C/KUuaG/dr/Wf1ug0="; sha256 = "sha256-xO34CR+SWxtHuP6G8m0jla0rivVp3ddrsODNo50MhHw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -23,11 +23,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sushi"; pname = "sushi";
version = "41.0"; version = "41.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "m3UlaQzkNmJO+gpgV3NJNDLNDva49GSYLouETtqYmO4="; sha256 = "JifbYWLnV3hZDAfhZbLzbqJNEjGlE7FkAj/G3fx1xKM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -10,7 +10,7 @@
, librsvg , librsvg
, libxml2 , libxml2
, desktop-file-utils , desktop-file-utils
, guile_3_0 , guile
, libcanberra-gtk3 , libcanberra-gtk3
, ninja , ninja
, appstream-glib , appstream-glib
@ -19,14 +19,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aisleriot"; pname = "aisleriot";
version = "3.22.21"; version = "3.22.22";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-dpzuePxSoJcwUlj314r5G9A8aF1Yz49r+DxNTfA8/Ks="; sha256 = "sha256-Jr4XEj6h+gI1gNqoJ/cJ3cDBB4mSbpzvOUQkwGxkLPs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
librsvg librsvg
guile_3_0 guile
libcanberra-gtk3 libcanberra-gtk3
]; ];

View file

@ -1,21 +1,46 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gtk3, wrapGAppsHook { stdenv
, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: , lib
, fetchurl
, meson
, ninja
, pkg-config
, gnome
, gtk3
, wrapGAppsHook
, librsvg
, libgnome-games-support
, gettext
, itstool
, libxml2
, python3
, vala
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "five-or-more"; pname = "five-or-more";
version = "3.32.2"; version = "3.32.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii"; sha256 = "LRDXLu/esyS0R9YyrwwySW4l/BWjwB230vAMm1HQnvQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkg-config gettext itstool libxml2 python3 wrapGAppsHook meson
ninja
pkg-config
gettext
itstool
libxml2
python3
wrapGAppsHook
vala vala
]; ];
buildInputs = [ buildInputs = [
gtk3 librsvg libgnome-games-support gnome.adwaita-icon-theme gtk3
librsvg
libgnome-games-support
]; ];
postPatch = '' postPatch = ''