From 0f96dffdb506a61e4bdbeb91755aa979126255b1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 13 Apr 2025 23:54:08 +0200
Subject: [PATCH] ostree: Replace libsoup_2_4 with libsoup_3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are using curl backend since 58ed9b3b2a387f1bfcfc9c1525e0c4c76fcc33aa
but libsoup is still used for trivial-httpd for tests.
Let’s just switch to libsoup_3 so that we can drop 2.4.

Also since we no longer use libsoup, we do not need glib-networking or
even wrapping (introduced in a350ad306aa8ee0a9d4fc28c533cad4e4c5493f5
to make libsoup support HTTPS).
---
 pkgs/by-name/os/ostree/package.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix
index 26521ca3b916..26a494941df3 100644
--- a/pkgs/by-name/os/ostree/package.nix
+++ b/pkgs/by-name/os/ostree/package.nix
@@ -10,8 +10,7 @@
   glib,
   xz,
   e2fsprogs,
-  libsoup_2_4,
-  wrapGAppsNoGuiHook,
+  libsoup_3,
   gpgme,
   which,
   makeWrapper,
@@ -35,8 +34,6 @@
   composefs,
   withGjs ? lib.meta.availableOn stdenv.hostPlatform gjs,
   gjs,
-  withGlibNetworking ? lib.meta.availableOn stdenv.hostPlatform glib-networking,
-  glib-networking,
   withIntrospection ?
     lib.meta.availableOn stdenv.hostPlatform gobject-introspection
     && stdenv.hostPlatform.emulatorAvailable buildPackages,
@@ -82,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
       libxslt
       docbook-xsl-nons
       docbook_xml_dtd_42
-      wrapGAppsNoGuiHook
     ]
     ++ lib.optionals withIntrospection [
       gobject-introspection
@@ -93,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
       curl
       glib
       e2fsprogs
-      libsoup_2_4
+      libsoup_3 # for trivial-httpd for tests
       gpgme
       fuse3
       libselinux
@@ -113,9 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals withGjs [
       gjs
     ]
-    ++ lib.optionals withGlibNetworking [
-      glib-networking
-    ]
     ++ lib.optionals withSystemd [
       systemd
     ];