From 763535823582f5072aafa1b1a73a212b6a10fe6f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:41:16 +0000 Subject: [PATCH 1/9] =?UTF-8?q?gnome.cheese:=2041.0=20=E2=86=92=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/cheese/41/cheese-41.1.news --- pkgs/desktops/gnome/apps/cheese/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 38754a556938..a6d70d162c08 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "41.0"; + version = "41.1"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "EG8d9n4c9Bwqp5yZveZ2rskA2wNstSX6EIObBhh9Ivk="; + sha256 = "UilgyihzD/ZkOQcLBEGMngpLtVVg11v+CLIY2ixn5Uc="; }; nativeBuildInputs = [ From e102c85c09b6658f5574e403d0d9c1a3c24f7bfe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:42:40 +0000 Subject: [PATCH 2/9] =?UTF-8?q?evince:=2041.2=20=E2=86=92=2041.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/evince/41/evince-41.3.news --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 45812dbc901a..eb85c97f9f21 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "41.2"; + version = "41.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; + sha256 = "M0awH5vcjy1f/qkvEQoJDGSjYklCtbVDqtRZKp3jO7A="; }; patches = lib.optionals withPantheon [ From 1ad7180e2132dcbb5c11611eb2e84e7dd06c91b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:43:33 +0000 Subject: [PATCH 3/9] =?UTF-8?q?gnome.gnome-flashback:=203.40.0=20=E2=86=92?= =?UTF-8?q?=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-flashback/3.42/gnome-flashback-3.42.0.news --- pkgs/desktops/gnome/misc/gnome-flashback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 3df9d7450cd7..bd4bbbae13a4 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.40.0"; + version = "3.42.0"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0"; + sha256 = "1CcdwHrHOyceS07cgfMfZPVzGqbUSOehXX2TOXbc3Us="; }; # make .desktop Execs absolute From e9f6e6c49f279a405debe8c081ad5f887011fe21 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:43:49 +0000 Subject: [PATCH 4/9] =?UTF-8?q?gnome.gnome-screenshot:=2040.0=20=E2=86=92?= =?UTF-8?q?=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-screenshot/41/gnome-screenshot-41.0.news --- pkgs/desktops/gnome/core/gnome-screenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix index 5b02fda3e32f..ba6d05b3cbf8 100644 --- a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-screenshot"; - version = "40.0"; + version = "41.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz"; - sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"; + sha256 = "Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc="; }; doCheck = true; From de1413c3966a74f01c8078519345727e59944b93 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:44:10 +0000 Subject: [PATCH 5/9] =?UTF-8?q?gtk-vnc:=201.2.0=20=E2=86=92=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/1.3/gtk-vnc-1.3.0.news --- pkgs/tools/admin/gtk-vnc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 5e00e487e23e..060c95a8f767 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -15,6 +15,7 @@ , vala , gettext , perl +, python3 , gnome , gdk-pixbuf , zlib @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtk-vnc"; - version = "1.2.0"; + version = "1.3.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jmr6igyzcj2wmx5v5ywaazvdz3hx6a6rys26yb4l4s71l281bvs"; + sha256 = "X6qlgjuMvowLC6HkVsTnDEsa5mhcn+gaQoLZjPAKIR0="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { vala gettext perl # for pod2man + python3 ]; buildInputs = [ From 74a4876377281cb83b2e226e71f98069a4c9baf3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:01 +0000 Subject: [PATCH 6/9] =?UTF-8?q?gnome-builder:=2041.1=20=E2=86=92=2041.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-builder/41/gnome-builder-41.2.news --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 38f38ae3a51b..1619ff1e6174 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "41.1"; + version = "41.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o="; + sha256 = "VjF7Vn94Yd2gNzKVsk6U7fSRnMlV+0XtYqyllGIY4BI="; }; nativeBuildInputs = [ From c87458e0023129164af036bd5e6e97417f91884e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:24 +0000 Subject: [PATCH 7/9] =?UTF-8?q?gupnp-tools:=200.10.1=20=E2=86=92=200.10.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.10/gupnp-tools-0.10.2.news --- pkgs/tools/networking/gupnp-tools/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index cc547cfb7df9..c29d2c501df8 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , gupnp @@ -18,26 +17,13 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TqltFnRis6VI78T8TqCJ/lGNfSm+NJ0czomCuf+1O0o="; + sha256 = "beSe9LN1uKFk90t2YWixGE4NKBlrawek9TQfCN/YXWw="; }; - patches = [ - # Fix compilation with -Werror=format-security. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp-tools/commit/d738baae3bffaf6a8dfc12f5fe1ea13168fe2e48.patch"; - sha256 = "wrORH4y9Yb0YGAsjzoeN2MM07y9o+91kx078RH0G76w="; - }) - # Fix missing variable reference caused by the previous patch. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp-tools/commit/9b852d91175bc7607ad845459ba29d07a16fcbce.patch"; - sha256 = "WjEBN/+snJSIg4SUP5iChdj2auIyzePI0TH3Ilks7fk="; - }) - ]; - nativeBuildInputs = [ meson ninja From e2b522ca015ce1e76232f690c37a3bc5fc717f1f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:32 +0000 Subject: [PATCH 8/9] =?UTF-8?q?libhandy:=201.4.0=20=E2=86=92=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/libhandy/1.5/libhandy-1.5.0.news Adds style manager but unlike with libadwaita, it is opt-in so existing apps should not be affected: https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/782#note_1257929 --- .../libraries/libhandy/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index bb4b03515eda..0744ae30f344 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -9,10 +9,11 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, glib +, gsettings-desktop-schemas , gtk3 , enableGlade ? false , glade -, dbus , xvfb-run , libxml2 , gdk-pixbuf @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.4.0"; + version = "1.5.0"; outputs = [ "out" @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JnbVH6H6QP3udJfT52P++hiwM4v/zS7jLn9+YzyIVEY="; + sha256 = "sha256-RmueAmwfnrO2WWb1MNl3A6ghLar5EXSMFF6cuEPb1v4="; }; nativeBuildInputs = [ @@ -64,7 +65,6 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - dbus xvfb-run at-spi2-atk at-spi2-core @@ -84,12 +84,26 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; checkPhase = '' - NO_AT_BRIDGE=1 \ - XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ - GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + HDY_DISABLE_PORTAL=1 + + "XDG_DATA_DIRS=${lib.concatStringsSep ":" [ + # HdySettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See hdy_settings_constructed function in https://gitlab.gnome.org/GNOME/libhandy/-/commit/bb68249b005c445947bfb2bee66c91d0fe9c41a4 + "${glib.getSchemaPath gsettings-desktop-schemas}/../.." + + # Some tests require icons + "${hicolor-icon-theme}/share" + ]}" + ) + env "''${testEnvironment[@]}" xvfb-run \ meson test --print-errorlogs + + runHook postCheck ''; passthru = { From ad4ff3050df5292d8ab39e159dbe0f999a641d5a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 19:50:12 +0100 Subject: [PATCH 9/9] gtk4.updateScript: correct policy 4.5.0 is unstable --- pkgs/development/libraries/gtk/4.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 5a61b78d85a8..d763c99882e0 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -216,6 +216,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gtk"; + versionPolicy = "odd-unstable"; attrPath = "gtk4"; }; };