mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-16 09:28:35 +03:00
Merge pull request #214067 from jtojnar/gnome-staging
GNOME staging updates
This commit is contained in:
commit
ff6056463e
@ -55,11 +55,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glib";
|
||||
version = "2.74.3";
|
||||
version = "2.74.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "6bxB7NlpDZvGqXDMc4ARm4KOW2pLFsOTxjiz3CuHy8s=";
|
||||
sha256 = "zrqDpZmc6zGkxPyZISB8uf//0qsdbsA8Fi0/YIpcFMg=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
@ -117,20 +117,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Disable flaky test.
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/issues/820
|
||||
./skip-timer-test.patch
|
||||
|
||||
# GVariant security fixes
|
||||
# https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3126.patch";
|
||||
sha256 = "CNCxouYy8xNHt4eJtPZ2eOi9b0SxzI2DkklNfQMk3d8=";
|
||||
})
|
||||
|
||||
# Menu model security fix
|
||||
# https://discourse.gnome.org/t/fixes-for-gdbusmenumodel-crashes-in-glib/12846
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/4f4d770a1e40f719d5a310cffdac29cbb4e20c11.patch";
|
||||
sha256 = "+S44AnC86HfbMwkRe1ll54IK9pLxaFD3LqiVhPelnXI=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gi-docgen";
|
||||
version = "2022.2";
|
||||
version = "2023.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz";
|
||||
sha256 = "JlQ5ENdqedYvZnEihWkqO2KnXzHQfLvupG7sfjTmOlQ=";
|
||||
sha256 = "qaaHwbfEpBOaIUvUUeAcqGExoxYfaKo+BzJbBgArv7Y=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
markdown
|
||||
markupsafe
|
||||
pygments
|
||||
toml
|
||||
toml # remove once python311 is the default
|
||||
typogrify
|
||||
];
|
||||
|
||||
|
@ -58,11 +58,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "networkmanager";
|
||||
version = "1.40.6";
|
||||
version = "1.40.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
|
||||
sha256 = "sha256-LwJbLVr33lk7v0fBfk2YorlgjqkKgmD7CAgL6XQ5U04=";
|
||||
sha256 = "sha256-wCJ+BKttAylmLfoKftxGbgQGJek2odjo4CoFM6cRca8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
|
||||
|
Loading…
Reference in New Issue
Block a user