From 08df099ccf85811d7293eaa758724e92ac5efda2 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 24 Jul 2025 10:10:43 +0200 Subject: [PATCH 1/5] mate.caja-extensions: Re-enable upnp plugin https://github.com/mate-desktop/caja-extensions/commit/1d21084e8ffdacb3e3b60840261b6d456d23887e --- pkgs/desktops/mate/caja-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 25c8d3a488637..993711849a104 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -8,7 +8,7 @@ glib, gst_all_1, gtk3, - gupnp, + gupnp_1_6, imagemagick, mate-desktop, wrapGAppsHook3, @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 - gupnp + gupnp_1_6 imagemagick mate-desktop ]; From 17190b0493fe46c21af40b1232e68d2f74e2e6db Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Jul 2025 20:17:22 +0800 Subject: [PATCH 2/5] timezonemap: Backport libsoup3 patch Using the updated version from https://salsa.debian.org/cinnamon-team/libtimezonemap/-/commit/ed57d8331a7429487b9c8ea97cc7bd684ed5a2e1 --- pkgs/by-name/ti/timezonemap/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/timezonemap/package.nix b/pkgs/by-name/ti/timezonemap/package.nix index ee22fb26d8fb3..f8dc8af47ea40 100644 --- a/pkgs/by-name/ti/timezonemap/package.nix +++ b/pkgs/by-name/ti/timezonemap/package.nix @@ -10,7 +10,7 @@ file, gobject-introspection, json-glib, - libsoup_2_4, + libsoup_3, }: stdenv.mkDerivation { @@ -30,6 +30,13 @@ stdenv.mkDerivation { url = "https://git.launchpad.net/ubuntu/+source/libtimezonemap/plain/debian/patches/timezone-map-Never-try-to-access-to-free-d-or-null-values.patch?id=88f72f724e63df061204f6818c9a1e7d8c003e29"; sha256 = "sha256-M5eR0uaqpJOeW2Ya1Al+3ZciXukzHpnjJTMVvdO0dPE="; }) + + # Port to libsoup3 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1068679 + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/libtimezonemap/plain/debian/patches/port-to-libsoup3.patch?id=b8346a99d4abece742bce73780ccf0edfa0b99f0"; + hash = "sha256-BHLVA3Vcakl9COAiSPo0OyFOUz4ejsxB22gJW/+m7NI="; + }) ]; nativeBuildInputs = [ @@ -42,7 +49,7 @@ stdenv.mkDerivation { gtk3 glib json-glib - libsoup_2_4 + libsoup_3 ]; configureFlags = [ From 0003a0cc9d1d686349502b633118797741af770b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Jul 2025 20:31:46 +0800 Subject: [PATCH 3/5] shotwell: Drop librest https://gitlab.gnome.org/GNOME/shotwell/-/commit/f779defe2b68396876c670dcb8735590a007c329 --- pkgs/by-name/sh/shotwell/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sh/shotwell/package.nix b/pkgs/by-name/sh/shotwell/package.nix index cfa106cf00a98..54484d5979e06 100644 --- a/pkgs/by-name/sh/shotwell/package.nix +++ b/pkgs/by-name/sh/shotwell/package.nix @@ -24,7 +24,6 @@ gcr, libgee, gexiv2, - librest, gettext, desktop-file-utils, gdk-pixbuf, @@ -81,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { glib-networking gdk-pixbuf librsvg - librest gcr adwaita-icon-theme libsecret From ca331e0330a769f63cd4bea1f8165562284c4c10 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Jul 2025 20:38:28 +0800 Subject: [PATCH 4/5] gnome-notes: Use webkit2gtk-4.1 This already depends on libedataserver-1.2 which requires libsoup3. --- pkgs/by-name/gn/gnome-notes/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index a67795c140bb9..85a6238d34d1a 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -19,7 +19,7 @@ libuuid, curl, libhandy, - webkitgtk_4_0, + webkitgtk_4_1, gnome, adwaita-icon-theme, libxml2, @@ -43,6 +43,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch"; hash = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4="; }) + + # build: Depend on webkit2gtk-4.1 + # https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/200 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/0791507873c96d0463cd0c83108415541f854edd.patch"; + hash = "sha256-TwCi9sDudeiOjrH2VevAynxvy/WTmwB2HrWqhviPg8o="; + }) ]; doCheck = true; @@ -71,7 +78,7 @@ stdenv.mkDerivation rec { libuuid curl libhandy - webkitgtk_4_0 + webkitgtk_4_1 tinysparql gnome-online-accounts gsettings-desktop-schemas From fe05b6739ca768d30008cd6df5b8a23fecea5aed Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Jul 2025 20:48:02 +0800 Subject: [PATCH 5/5] gthumb: Disable webservices and libchamplain webservices completely removed on upstream in next release: https://gitlab.gnome.org/GNOME/gthumb/-/commit/6738d43fe1b48745fde80a9ca5c80f8e0f12f7e9 --- pkgs/by-name/gt/gthumb/package.nix | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix index 5ecf555b233c9..946782f8e0ffd 100644 --- a/pkgs/by-name/gt/gthumb/package.nix +++ b/pkgs/by-name/gt/gthumb/package.nix @@ -13,17 +13,13 @@ libtiff, gst_all_1, libraw, - libsoup_2_4, - libsecret, glib, gtk3, gsettings-desktop-schemas, - libchamplain, libjxl, librsvg, libwebp, libX11, - json-glib, lcms2, bison, flex, @@ -33,8 +29,6 @@ python3, desktop-file-utils, itstool, - withWebservices ? true, - webkitgtk_4_0, }: stdenv.mkDerivation (finalAttrs: { @@ -70,26 +64,23 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk3 - json-glib lcms2 - libchamplain libheif libjpeg libjxl libraw librsvg - libsecret - libsoup_2_4 libtiff libwebp libX11 - ] - ++ lib.optional withWebservices webkitgtk_4_0; + ]; mesonFlags = [ - "-Dlibchamplain=true" "-Dlibjxl=true" - (lib.mesonBool "webservices" withWebservices) + # Depends on libsoup2. + # https://gitlab.gnome.org/GNOME/gthumb/-/issues/244 + "-Dlibchamplain=false" + "-Dwebservices=false" ]; postPatch = '' @@ -119,6 +110,9 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "gthumb"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ maintainers.mimame ]; + maintainers = with maintainers; [ + bobby285271 + mimame + ]; }; })