mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge pull request #324341 from bobby285271/upd/gnome
GNOME updates 2024-07-03
This commit is contained in:
commit
35a90c3f3d
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.52.2";
|
||||
version = "3.52.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-qVUPG1PUdANt0jmWJ7MRjrO4QxhBztwO3yFFewlhkUE=";
|
||||
hash = "sha256-H9Y4L9X9MAQ4Rc/F3Ew0/gErzINRK2AwFUJQvGGAaMA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -45,11 +45,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.52.2";
|
||||
version = "3.52.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-pIt0EtE+2sdPbAms+mdmVuahLt8AMM3cJgKawE2j5VE=";
|
||||
hash = "sha256-HCL1O1VU4mCkjpF/PWaYNNJOTTrVoSTL4EKipKzkQcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "epiphany";
|
||||
version = "46.1";
|
||||
version = "46.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Jg+BRp7WR0bCsRQ/Lzi+3NloR3hlZ7CX2fcv072dsUI=";
|
||||
hash = "sha256-+5Mtp6JOh/HtuQC1uUJRtCs3CAdThkZRwFncbJPLUEk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -481,7 +481,7 @@ index 734f194..5b05077 100644
|
||||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c
|
||||
index c8bbd3a..e71e36a 100644
|
||||
index 3a9ce9c..f96b840 100644
|
||||
--- a/src/libedataserver/e-oauth2-service-yahoo.c
|
||||
+++ b/src/libedataserver/e-oauth2-service-yahoo.c
|
||||
@@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service,
|
||||
|
@ -50,13 +50,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.52.2";
|
||||
version = "3.52.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-oAakTtyzjSb/scYuHV0KMdHy5ZB1Vl4mx5ou4BxFp+U=";
|
||||
hash = "sha256-6fbIDBQgM7GAG8yqYiHEU9406tTqCJsghrGQhvmpwuQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -129,7 +129,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_UOA=OFF"
|
||||
"-DENABLE_VALA_BINDINGS=ON"
|
||||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
|
||||
|
@ -28,13 +28,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "46.1";
|
||||
version = "46.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-z2deNQwYrA+ilDbGVZ0dqXX3///vqAjr5HbY+enRERQ=";
|
||||
hash = "sha256-j2MpmxpPnDCFfCKfapzhbyxD6u6pD7+QkxTKi7c+/V4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -68,16 +68,16 @@
|
||||
, gnome-user-share
|
||||
, gnome-remote-desktop
|
||||
, wrapGAppsHook4
|
||||
, xvfb-run
|
||||
, xorgserver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-control-center";
|
||||
version = "46.2";
|
||||
version = "46.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-YzXGy4Fk5XTbUh//Yc+j36pV8dtmrjvKAnUKGT4cTz0=";
|
||||
hash = "sha256-l9xsfR3uGVkU88vIRbaBZLdhFIDYk760EQBsFerkbLk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -155,9 +155,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
python3.pkgs.pygobject3 # for test-networkmanager-service.py
|
||||
python3.pkgs.python-dbusmock
|
||||
setxkbmap
|
||||
xvfb-run
|
||||
xorgserver # for Xvfb
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
@ -167,19 +168,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
testEnvironment=(
|
||||
# Basically same as https://github.com/NixOS/nixpkgs/pull/141299
|
||||
"ADW_DISABLE_PORTAL=1"
|
||||
"XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas}"
|
||||
)
|
||||
|
||||
env "''${testEnvironment[@]}" xvfb-run \
|
||||
meson test --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
preCheck = ''
|
||||
# Basically same as https://github.com/NixOS/nixpkgs/pull/141299
|
||||
export ADW_DISABLE_PORTAL=1
|
||||
export XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "46.2";
|
||||
version = "46.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-bHktiSrbYLDeC33oglwUlD0c0nmvT5x2So9UEbYKjyc=";
|
||||
hash = "sha256-o/AQgp9NTI1J+Dqxz6uCG2GyeA6eC15Wicfv8/hE7T4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -90,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-Dvendor-conf-file=${./vendor.conf}"
|
||||
];
|
||||
|
||||
PKG_CONFIG_SYSTEMD_SYSUSERSDIR = "${placeholder "out"}/lib/sysusers.d";
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-initial-setup";
|
||||
|
@ -30,11 +30,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-remote-desktop";
|
||||
version = "46.2";
|
||||
version = "46.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-l0Q+r/5LGmliaIakHSXL6ywUjT/tQ9khFcG30g1SOKs=";
|
||||
hash = "sha256-CMZlbxHUY560lyqJKej1AkJ9weLqAz4CyZK7Gkx315Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -14,7 +14,6 @@
|
||||
, networkmanager
|
||||
, gi-docgen
|
||||
, at-spi2-core
|
||||
, libstartup_notification
|
||||
, unzip
|
||||
, shared-mime-info
|
||||
, libgweather
|
||||
@ -43,7 +42,6 @@
|
||||
, gjs
|
||||
, mutter
|
||||
, evolution-data-server-gtk4
|
||||
, gtk3
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, sassc
|
||||
@ -59,6 +57,10 @@
|
||||
, asciidoc
|
||||
, bash-completion
|
||||
, mesa
|
||||
, libGL
|
||||
, libXi
|
||||
, libX11
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
let
|
||||
@ -66,13 +68,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell";
|
||||
version = "46.2";
|
||||
version = "46.3.1";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-a1hxAcBL+zZKsJzTi12T6+60JUdUyAfPcS+8juP94jg=";
|
||||
hash = "sha256-575fxu4sxSitJh3HpVyN5aMkEtPWhAoKB14PwSoH/4s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -131,13 +133,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
networkmanager
|
||||
libstartup_notification
|
||||
gjs
|
||||
mutter
|
||||
libpulseaudio
|
||||
evolution-data-server-gtk4
|
||||
libical
|
||||
gtk3
|
||||
gtk4
|
||||
libadwaita
|
||||
gdm
|
||||
@ -151,6 +151,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gnome-desktop
|
||||
gnome-settings-daemon
|
||||
mesa
|
||||
libGL # for egl, required by mutter-clutter
|
||||
libXi # required by libmutter
|
||||
libX11
|
||||
libxml2
|
||||
|
||||
# recording
|
||||
pipewire
|
||||
|
@ -46,11 +46,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-software";
|
||||
version = "46.2";
|
||||
version = "46.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-5wDLood2T14iVVFOMS4WBVD9v3pdP+FjWLtve2cyuXQ=";
|
||||
hash = "sha256-nWvB9jfYGytZhYN5BPBe1wdgAUfZrxYLqJEqvy1C8TY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -66,13 +66,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "46.2";
|
||||
version = "46.3";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-AJuqd/g2JhLKouGMM4obPIqtO1/ilkwv73gk0yEiiYM=";
|
||||
hash = "sha256-cWgKkXTS/ThIgby2CrFQBAD+6DwMvP69kJQHqaQUTYo=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sudoku";
|
||||
version = "46.2";
|
||||
version = "46.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-K8wzwpHkTVJEj9saRwqKsJ9TxCMEBPbuCoakir8qNGw=";
|
||||
hash = "sha256-OKJqwUvlO2w0/9UuxmhSVpFEQHSF4xsvgXkn0hdmUSQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gexiv2";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Kgyc9I++izQ1AIhm/9QLjt2wZn0iErQjlv32iOk84L4=";
|
||||
sha256 = "IeZNLFbpszPUT+8/KkslZT2SLEGazZcvqW+raVIX4sg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.50.2";
|
||||
version = "3.50.3";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-3xatl10TnGv8TrsuyLuDJyl6eR7yvwuXfHgHavX6qY4=";
|
||||
hash = "sha256-5xSmfRccVxRDYet07oKhexXQqCIo/xiM+ScE9WJsopQ=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpeas";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-8w3/7WPKL0BHe0DhccCjH4DZFCW6Hh5HMg7mQlSA7MM=";
|
||||
hash = "sha256-OeO1B8KdLQHfE0XpszgP16nQrrWy5lfTjmwr6lAj5fA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
Loading…
Reference in New Issue
Block a user