ostree: Replace libsoup_2_4 with libsoup_3

We are using curl backend since 58ed9b3b2a
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 a350ad306a
to make libsoup support HTTPS).
This commit is contained in:
Jan Tojnar
2025-04-14 09:16:31 +02:00
parent 0c327564f5
commit 0f96dffdb5
+2 -9
View File
@@ -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
];