b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #204383 from jtojnar/gnome-staging

Browse source 
GNOME staging updates
This commit is contained in:
Jan Tojnar 2022-12-06 16:25:14 +01:00 committed by GitHub
parent 60f52f6c83 2edad4b9c2
commit f2d78a4d52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/data/misc/mobile-broadband-provider-info/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mobile-broadband-provider-info";
version = "20220725";
version = "20221107";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-SEWuAcKH8t+wIrxi1ZoUiHP/xKZz9RAgViZXQm1jKs0=";
sha256 = "sha256-2TOSVmw0epbu2V2oxmpdoN2U9BFc+zowX/JoLGTP2BA=";
};
nativeBuildInputs = [

12
pkgs/development/libraries/glib/default.nix
View file

@ -56,11 +56,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "glib";
version = "2.74.1";
version = "2.74.3";
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
sha256 = "CrmBYY0dtHhF5WQXsNfBI/gaNCeyuck/Wkb/W7uWSWQ=";
sha256 = "6bxB7NlpDZvGqXDMc4ARm4KOW2pLFsOTxjiz3CuHy8s=";
};
patches = lib.optionals stdenv.isDarwin [
@ -118,14 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
# Disable flaky test.
# https://gitlab.gnome.org/GNOME/glib/-/issues/820
./skip-timer-test.patch
# Fix infinite loop (e.g. in gnome-keyring)
# https://github.com/NixOS/nixpkgs/pull/197754#issuecomment-1312805358
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/2a36bb4b7e46f9ac043561c61f9a790786a5440c.patch";
sha256 = "b77Hxt6WiLxIGqgAj9ZubzPWrWmorcUOEe/dp01BcXA=";
})
];
outputs = [ "bin" "out" "dev" "devdoc" ];

15
pkgs/development/libraries/gtk/3.x.nix
View file

@ -2,6 +2,7 @@
, stdenv
, substituteAll
, fetchurl
, fetchpatch2
, pkg-config
, gettext
, docbook-xsl-nons
@ -60,7 +61,7 @@ in
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.34";
version = "3.24.35";
outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
outputBin = "dev";
@ -72,12 +73,22 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "sha256-28afkN3IIbjRRB8AN03B2kMjour6kHjmHtvl7u+oUuw=";
sha256 = "sha256-7BD+bXEu8LPGO1+TJjnJ0a6Z/OlPUA9vBpZWKf72C9E=";
};
patches = [
./patches/3.0-immodules.cache.patch
./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch
# Add accidentally non-dist’d build file.
# https://gitlab.gnome.org/GNOME/gtk/-/commit/b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/66a199806ceb3daa5e2c7d3a5b45a86007cec46a.patch";
includes = [
"gdk/wayland/cursor/meson.build"
];
sha256 = "cOOcSB3yphff2+7l7YpFbGSswWjV8lJ2tk+Vjgl1ras=";
})
] ++ lib.optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it

4
pkgs/development/libraries/pango/default.nix
View file

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "pango";
version = "1.50.11";
version = "1.50.12";
outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "iAD4Etie5hOIGIcDID86eHiWPCL4aVqvH6ChoUKNF64=";
sha256 = "yu+W0nu+eSpr6ScnxzRo2DKxPaV8gHHvebnfae4Fj+M=";
};
depsBuildBuild = [

4
pkgs/development/libraries/tracker/default.nix
View file

@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.4.1";
version = "3.4.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "6p1BqfucK0KtgPwsgjJ7XHE9WUyWmwnhpJvmP7dPT64=";
sha256 = "Tm3xQqT3BIePypjrtaIkdQ5epUaqKqq6pyanNUC9FzE=";
};
patches = [

4
pkgs/tools/networking/networkmanager/default.nix
View file

@ -58,11 +58,11 @@ let
in
stdenv.mkDerivation rec {
pname = "networkmanager";
version = "1.40.2";
version = "1.40.6";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "sha256-sSbnWiNJNsmcR7JZxVEg692b92rE79MMmBHlagSBwnM=";
sha256 = "sha256-LwJbLVr33lk7v0fBfk2YorlgjqkKgmD7CAgL6XQ5U04=";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];