From 7d254361827af3181e3f7c090f83a8435b975d3b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Oct 2022 05:05:25 +0200 Subject: [PATCH 1/6] ostree: Do not depend on GTK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `wrapGAppsHook` was introduced in https://github.com/NixOS/nixpkgs/commit/a350ad306aa8ee0a9d4fc28c533cad4e4c5493f5 to ensure `glib-networking` is picked up into `GIO_EXTRA_MODULES` environment variable. But for that `wrapGAppsNoGuiHook` is sufficient, so let’s switch to that. --- pkgs/tools/misc/ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 6d1ca41e937b..3ef92d895a06 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -15,7 +15,7 @@ , e2fsprogs , libsoup , glib-networking -, wrapGAppsHook +, wrapGAppsNoGuiHook , gpgme , which , makeWrapper @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ From b789ab3c2497496f80819d1c1d7c8da1a498b306 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Oct 2022 05:08:20 +0200 Subject: [PATCH 2/6] gnome.gnome-software: Switch to libsoup 3 Flatpak and ostree now use curl. --- pkgs/desktops/gnome/core/gnome-software/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index f5d299817a81..2ab87cf2924a 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -12,7 +12,7 @@ , ostree , glib , appstream -, libsoup +, libsoup_3 , libadwaita , polkit , isocodes @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { glib packagekit appstream - libsoup + libsoup_3 libadwaita gsettings-desktop-schemas gnome-desktop @@ -102,8 +102,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # Needs flatpak to upgrade - "-Dsoup2=true" # Requires /etc/machine-id, D-Bus system bus, etc. "-Dtests=false" ] ++ lib.optionals (!withFwupd) [ From 5b6b539f4fd81179e06f0720ee39e2faf97a1de5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Oct 2022 05:27:14 +0200 Subject: [PATCH 3/6] gnome.sushi: Switch to libsoup 3 This was forgotten in GNOME 43 update. https://gitlab.gnome.org/GNOME/sushi/-/commit/f73bd9494728f4c159cfce430be9904398b233c7 --- pkgs/desktops/gnome/core/sushi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 3c7377630c75..0172b1b83f42 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -8,7 +8,7 @@ , gnome , gtksourceview4 , gjs -, libsoup +, libsoup_3 , webkitgtk_4_1 , icu , wrapGAppsHook @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gtksourceview4 gdk-pixbuf librsvg - libsoup + libsoup_3 webkitgtk_4_1 libepoxy gst_all_1.gstreamer From ae621db1ccc06381ef8b3a0b440e3823d496c1fb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Oct 2022 05:36:43 +0200 Subject: [PATCH 4/6] gnome.gitg: drop libsoup dependency It was removed in 41: https://gitlab.gnome.org/GNOME/gitg/-/commit/3fff7926332e0f2ba2aff24407d1fe0fd547c375 --- pkgs/desktops/gnome/misc/gitg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix index 31e6bd7f2ed1..e2d008a8697e 100644 --- a/pkgs/desktops/gnome/misc/gitg/default.nix +++ b/pkgs/desktops/gnome/misc/gitg/default.nix @@ -12,7 +12,6 @@ , libpeas , bash , gobject-introspection -, libsoup , gtksourceview4 , gsettings-desktop-schemas , adwaita-icon-theme @@ -22,6 +21,7 @@ , libgee , libgit2-glib , libsecret +, libxml2 , meson , ninja , python3 @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { libgit2-glib libpeas libsecret - libsoup + libxml2 ]; doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed From 4db165bd2f32e1d346dee3bcd1fe583189e45613 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Oct 2022 05:40:39 +0200 Subject: [PATCH 5/6] gnome.gnome-tweaks: Drop libsoup dependency It is not actually used: https://gitlab.gnome.org/GNOME/gnome-tweaks/-/issues/407 --- pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 5643741aceb4..efad1cc14db4 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -13,7 +13,6 @@ , itstool , libhandy , libnotify -, libsoup , libxml2 , pkg-config , python3Packages @@ -54,7 +53,6 @@ python3Packages.buildPythonApplication rec { gtk3 libhandy libnotify - libsoup ]; pythonPath = with python3Packages; [ From c19e36ff21870cac51a33dec83133cb949ab216d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Oct 2022 05:54:27 +0200 Subject: [PATCH 6/6] folks: Remove unused dependencies --- pkgs/development/libraries/folks/default.nix | 36 +++++++++----------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 41ede8b85a84..0471283ef00c 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,28 +1,22 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , meson , ninja , glib , gnome -, nspr , gettext , gobject-introspection , vala , sqlite -, libxml2 , dbus-glib -, libsoup -, nss , dbus , libgee , evolution-data-server-gtk4 -, libsecret -, db , python3 , readline -, gtk3 , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -43,31 +37,35 @@ stdenv.mkDerivation rec { sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY="; }; + patches = [ + # Do not check for unneeded GTK dependency. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/-/commit/686d58fb2454e5038bb951423245ed8c2d4b5cf6.patch"; + sha256 = "0ydafVKhSrkHZK8bitPF5mNDTG5GrixGzBgBLNzLuXQ="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection - gtk3 gtk-doc docbook-xsl-nons docbook_xml_dtd_43 meson ninja pkg-config - python3 vala + ] ++ lib.optionals telepathySupport [ + python3 ]; buildInputs = [ - db dbus-glib - evolution-data-server-gtk4 - libsecret - libsoup - libxml2 - nspr - nss + evolution-data-server-gtk4 # UI part not needed, using gtk4 version to reduce system closure. readline - ] ++ lib.optional telepathySupport telepathy-glib; + ] ++ lib.optionals telepathySupport [ + telepathy-glib + ]; propagatedBuildInputs = [ glib @@ -105,9 +103,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py + postPatch = lib.optionalString telepathySupport '' patchShebangs tests/tools/manager-file.py '';