libsoup_2_4: Rename from libsoup

The 2.4 ABI branch has not been supported by upstream for a while now but people still keep accidentally adding it to new packages.
This commit is contained in:
Jan Tojnar 2024-12-01 23:27:07 +01:00
parent 9f377dfe69
commit 064ee2cb49
73 changed files with 156 additions and 169 deletions

View file

@ -22,7 +22,7 @@
, libcdio-paranoia, withCD ? true
, keybinder3, withKeybinder ? false
, libnotify, withLibnotify ? false
, libsoup, withLibsoup ? false
, libsoup_2_4, withLibsoup ? false
, libgudev, withGudev ? false # experimental
, libmtp, withMtp ? false # experimental
, xfce, withXfce4ui ? false
@ -73,7 +73,7 @@ mkDerivation rec {
++ lib.optional withLibnotify libnotify
++ lib.optional withLastfm liblastfmSF
++ lib.optional withGlyr glyr
++ lib.optional withLibsoup libsoup
++ lib.optional withLibsoup libsoup_2_4
++ lib.optional withMtp libmtp
++ lib.optional withXfce4ui xfce.libxfce4ui
++ lib.optional withTotemPlParser totem-pl-parser

View file

@ -27,7 +27,7 @@
, librevenge
, librsvg
, libsigcxx
, libsoup
, libsoup_2_4
, libvisio
, libwpg
, libXft
@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
librevenge
librsvg # for loading icons
libsigcxx
libsoup
libsoup_2_4
libvisio
libwpg
libXft

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit
, pkg-config, wrapGAppsHook3
, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0
, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup_2_4, webkitgtk_4_0
, xorg, dmenu, findutils, gnused, coreutils, gst_all_1
, patches ? null
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
glib-networking
gsettings-desktop-schemas
gtk
libsoup
libsoup_2_4
webkitgtk_4_0
] ++ (with gst_all_1; [
# Audio & video support for webkitgtk WebView

View file

@ -3,7 +3,7 @@
, vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
, libadwaita
, libnotify, libsoup, libgee
, libnotify, libsoup_2_4, libgee
, libsignal-protocol-c
, libgcrypt
, sqlite
@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
libnotify
gpgme
libgcrypt
libsoup
libsoup_2_4
pcre2
icu
libsignal-protocol-c
@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
"-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
"-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
"-DSOUP_VERSION=${lib.versions.major libsoup.version}"
"-DSOUP_VERSION=${lib.versions.major libsoup_2_4.version}"
];
# Undefined symbols for architecture arm64: "_gpg_strerror"

View file

@ -1,6 +1,6 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
libpng12
libpulseaudio
libsecret
libsoup
libsoup_2_4
libvorbis
libxml2
llvmPackages_12.libunwind

View file

@ -6,7 +6,7 @@
, libofx
, intltool
, wrapGAppsHook3
, libsoup
, libsoup_2_4
, adwaita-icon-theme
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
gtk
libgsf
libofx
libsoup
libsoup_2_4
adwaita-icon-theme
];

View file

@ -8,7 +8,7 @@
glib-networking,
google-fonts,
lib,
libsoup,
libsoup_2_4,
nodejs,
npmHooks,
openssl,
@ -70,7 +70,7 @@ rustPlatform.buildRustPackage {
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
libsoup
libsoup_2_4
webkitgtk_4_0
]
++ dotnetSdk.packages

View file

@ -44,7 +44,7 @@
, isocodes
, libpsl
, libepoxy
, libsoup
, libsoup_2_4
, exiv2
, libXtst
, libthai
@ -138,7 +138,7 @@ stdenv.mkDerivation {
libsecret
libselinux
libsepol
libsoup
libsoup_2_4
libsysprof-capture
libthai
libwebp

View file

@ -10,7 +10,7 @@
, gettext
, gtk3
, libmpdclient
, libsoup
, libsoup_2_4
, libxml2
, taglib
, wrapGAppsHook3
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
dbus-glib
gtk3
libmpdclient
libsoup
libsoup_2_4
libxml2
taglib
];

View file

@ -14,7 +14,7 @@
, webkitgtk_4_0
, librsvg
, gdk-pixbuf
, libsoup
, libsoup_2_4
, glib-networking
, graphicsmagick_q16
, libva
@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
webkitgtk_4_0
librsvg
gdk-pixbuf
libsoup
libsoup_2_4
glib-networking
graphicsmagick_q16
hiredis

View file

@ -6,7 +6,7 @@
cargo-tauri,
cargo-tauri_1,
gtk3,
libsoup,
libsoup_2_4,
openssl,
webkitgtk_4_0,
}:
@ -40,7 +40,7 @@ cargo-tauri.overrideAttrs (
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3
libsoup
libsoup_2_4
webkitgtk_4_0
];

View file

@ -8,7 +8,7 @@
cairo,
stdenv,
librsvg,
libsoup,
libsoup_2_4,
fetchzip,
openssl_3,
webkitgtk_4_0,
@ -43,7 +43,7 @@ stdenv.mkDerivation {
gtk3
cairo
gdk-pixbuf
libsoup
libsoup_2_4
glib
dbus
openssl_3

View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
, libsoup
, libsoup_2_4
, graphicsmagick
, json-glib
, wrapGAppsHook3
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
openexr_3
sqlite
libxslt
libsoup
libsoup_2_4
graphicsmagick
json-glib
openjpeg

View file

@ -6,7 +6,7 @@
, makeDesktopItem
, pkg-config
, gtk3
, libsoup
, libsoup_2_4
, webkitgtk_4_0
}:
@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
gtk3
libsoup
libsoup_2_4
webkitgtk_4_0
];

View file

@ -11,7 +11,7 @@
, gupnp
, gupnp-av
, gupnp-dlna
, libsoup
, libsoup_2_4
, makeWrapper
, docbook-xsl-nons
, libxslt
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
gupnp
gupnp-av
gupnp-dlna
libsoup
libsoup_2_4
];
preFixup = ''

View file

@ -12,7 +12,7 @@
, gupnp
, gupnp-av
, gupnp-dlna
, libsoup
, libsoup_2_4
}:
stdenv.mkDerivation rec {
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
gupnp
gupnp-av
gupnp-dlna
libsoup
libsoup_2_4
];
preFixup = ''

View file

@ -12,7 +12,7 @@
makeBinaryWrapper,
openssl,
libsoup,
libsoup_2_4,
webkitgtk_4_0,
gst_all_1,
apple-sdk_11,
@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
openssl
libsoup
libsoup_2_4
webkitgtk_4_0
gst_all_1.gstreamer
gst_all_1.gst-plugins-base

View file

@ -13,7 +13,7 @@
, gtk3
, libgee
, libhandy
, libsoup
, libsoup_2_4
, json-glib
, glib-networking
, desktop-file-utils
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
json-glib
libgee
libhandy
libsoup
libsoup_2_4
pantheon.granite
];

View file

@ -10,7 +10,7 @@
, gtk3
, glib-networking
, libgee
, libsoup
, libsoup_2_4
, json-glib
, sqlite
, webkitgtk_4_0
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
json-glib
libgee
libmanette
libsoup
libsoup_2_4
libXtst
sqlite
webkitgtk_4_0

View file

@ -10,7 +10,7 @@
, docbook-xsl-nons
, gobject-introspection
, gnome
, libsoup
, libsoup_2_4
, json-glib
, glib
, nixosTests
@ -45,12 +45,12 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
libsoup
libsoup_2_4
json-glib
];
mesonFlags = [
"-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}"
"-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];

View file

@ -6,7 +6,7 @@
, librest
, gnome-online-accounts
, gnome
, libsoup
, libsoup_2_4
, json-glib
, gobject-introspection
, gtk-doc
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
libsoup
libsoup_2_4
json-glib
librest
];

View file

@ -15,7 +15,7 @@
jq,
nodejs,
pkg-config,
libsoup,
libsoup_2_4,
moreutils,
openssl,
rust,
@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec {
[ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
libsoup
libsoup_2_4
webkitgtk_4_0
]
++ lib.optionals stdenv.hostPlatform.isDarwin (

View file

@ -11,7 +11,7 @@
, wrapGAppsHook3
, gtk3
, glib
, libsoup
, libsoup_2_4
, gnome-online-accounts
, librest
, json-glib
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
glib
libsoup
libsoup_2_4
gnome-online-accounts
librest
json-glib

View file

@ -2,7 +2,7 @@
rustPlatform,
lib,
fetchFromGitHub,
libsoup,
libsoup_2_4,
openssl,
pkg-config,
perl,
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs = [
libsoup
libsoup_2_4
openssl
webkitgtk_4_0
];

View file

@ -12,7 +12,7 @@
, libtiff
, gst_all_1
, libraw
, libsoup
, libsoup_2_4
, libsecret
, glib
, gtk3
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
libraw
librsvg
libsecret
libsoup
libsoup_2_4
libtiff
libwebp
libX11

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, which, pkg-config, gtk2, pcre, glib, libxml2
, libsoup ? null
, libsoup_2_4 ? null
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# Not adding 'hostname' command, the build shouldn't depend on what the build
# host is called.
nativeBuildInputs = [ pkg-config ];
buildInputs = [ which gtk2 pcre glib libxml2 libsoup ];
buildInputs = [ which gtk2 pcre glib libxml2 libsoup_2_4 ];
# Fixes '#error You must compile this program without "-O"'
hardeningDisable = [ "all" ];

View file

@ -16,7 +16,7 @@
, gupnp-dlna
, gst_all_1
, libgee
, libsoup
, libsoup_2_4
, gtk3
, libmediaart
, sqlite
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
gupnp-av
gupnp-dlna
libgee
libsoup
libsoup_2_4
gtk3
libmediaart
sqlite

View file

@ -6,7 +6,7 @@
, openssl
, pkg-config
, freetype
, libsoup
, libsoup_2_4
, gtk3
, webkitgtk_4_0
, perl
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
dbus
openssl.out
freetype
libsoup
libsoup_2_4
gtk3
webkitgtk_4_0
];

View file

@ -8,7 +8,7 @@
, openssl
, libsecret
, webkitgtk_4_0
, libsoup
, libsoup_2_4
, gtk3
, atk
, pango
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
openssl
libsecret
webkitgtk_4_0
libsoup
libsoup_2_4
gtk3
atk
glib

View file

@ -14,7 +14,7 @@
, sqlite
, gnome
, clutter-gtk
, libsoup
, libsoup_2_4
, libsoup_3
, gobject-introspection /*, libmemphis */
, withLibsoup3 ? false
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [
sqlite
(if withLibsoup3 then libsoup_3 else libsoup)
(if withLibsoup3 then libsoup_3 else libsoup_2_4)
];
propagatedBuildInputs = [

View file

@ -10,7 +10,7 @@
, avahi
, gnutls
, libuuid
, libsoup
, libsoup_2_4
, gtk3
, gnome
}:
@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
avahi
gnutls
libsoup
libsoup_2_4
];
enableParallelBuilding = true;

View file

@ -16,7 +16,7 @@
, p11-kit
, openssl
, uhttpmock
, libsoup
, libsoup_2_4
}:
stdenv.mkDerivation rec {
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
glib
libsoup
libsoup_2_4
libxml2
gnome-online-accounts
json-glib

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
, gnome, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }:
, gnome, libgee, glib, json-glib, libarchive, libsoup_2_4, gobject-introspection }:
let
pname = "libhttpseverywhere";
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
buildInputs = [ glib libgee json-glib libsoup libarchive ];
buildInputs = [ glib libgee json-glib libsoup_2_4 libarchive ];
patches = [
# Fixes build with vala >=0.42

View file

@ -6,7 +6,7 @@
, gobject-introspection
, gmime3
, libxml2
, libsoup
, libsoup_2_4
, pkg-config
}:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gmime3
libxml2
libsoup
libsoup_2_4
];
meta = with lib; {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }:
{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup_2_4, gnome, gnome-online-accounts, gobject-introspection }:
stdenv.mkDerivation rec {
pname = "libzapojit";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config intltool gobject-introspection ];
propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc
propagatedBuildInputs = [ glib json-glib librest libsoup_2_4 gnome-online-accounts ]; # zapojit-0.0.pc
passthru = {
updateScript = gnome.updateScript {

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub
, desktop-file-utils, glib, gtk3, meson, ninja, pkg-config, python3, vala
, wrapGAppsHook3
, glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup
, glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup_2_4
}:
stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
glib glib-networking gtk3 json-glib libgee libhandy
libsoup
libsoup_2_4
];
postPatch = ''

View file

@ -15,7 +15,7 @@
, gtk3
, json-glib
, libappindicator
, libsoup
, libsoup_2_4
, webkitgtk_4_0
}:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
gtk3
json-glib
libappindicator
libsoup
libsoup_2_4
webkitgtk_4_0
];

View file

@ -12,7 +12,7 @@
, webkitgtk_4_0
, sqlite
, gsettings-desktop-schemas
, libsoup
, libsoup_2_4
, glib-networking
, json-glib
, libarchive
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
(libsoup.override { gnomeSupport = true; })
(libsoup_2_4.override { gnomeSupport = true; })
gcr
glib-networking
gsettings-desktop-schemas

View file

@ -14,7 +14,7 @@
libXtst,
libevdev,
gtk3,
libsoup,
libsoup_2_4,
webkitgtk_4_0,
}:
@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
# Tauri deps
gtk3
libsoup
libsoup_2_4
webkitgtk_4_0
];

View file

@ -1,4 +1,4 @@
{ cairo, fetchzip, glib, libsoup, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
{ cairo, fetchzip, glib, libsoup_2_4, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
stdenv.mkDerivation rec {
pname = "osm-gps-map";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo glib
gtk3
libsoup
libsoup_2_4
];
meta = with lib; {

View file

@ -12,7 +12,7 @@
, systemd
, xz
, e2fsprogs
, libsoup
, libsoup_2_4
, glib-networking
, wrapGAppsNoGuiHook
, gpgme
@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
glib
systemd
e2fsprogs
libsoup
libsoup_2_4
glib-networking
gpgme
fuse3

View file

@ -15,7 +15,7 @@
libayatana-appindicator,
gtk3,
webkitgtk_4_0,
libsoup,
libsoup_2_4,
openssl,
xdotool,
}:
@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gtk3
libsoup
libsoup_2_4
libayatana-appindicator
openssl
webkitgtk_4_0

View file

@ -14,7 +14,7 @@
, libevdev
, libgee
, libgudev
, libsoup
, libsoup_2_4
, pantheon
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
libevdev
libgee
libgudev
libsoup
libsoup_2_4
pantheon.granite
];

View file

@ -2,7 +2,7 @@
dbus,
openssl,
freetype,
libsoup,
libsoup_2_4,
gtk3,
webkitgtk_4_0,
pkg-config,
@ -66,7 +66,7 @@ in
'';
nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems];
buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0];
buildInputs = [dbus openssl freetype libsoup_2_4 gtk3 webkitgtk_4_0];
# Disable checkPhase, since the project doesn't contain tests
doCheck = false;

View file

@ -6,7 +6,7 @@
, libgee
, libhandy
, libsecret
, libsoup
, libsoup_2_4
, meson
, ninja
, nix-update-script
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
libgee
libhandy
libsecret
libsoup
libsoup_2_4
pantheon.granite
];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python3, libxml2, dbus-glib, dbus
, sqlite, libsoup, libnice, gnutls
, sqlite, libsoup_2_4, libnice, gnutls
, fetchpatch
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config libxslt python3 ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup_2_4 libnice telepathy-glib gnutls ];
nativeCheckInputs = [ dbus ];

View file

@ -9,7 +9,7 @@
, file
, gobject-introspection
, json-glib
, libsoup
, libsoup_2_4
}:
stdenv.mkDerivation rec {
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
gtk3
glib
json-glib
libsoup
libsoup_2_4
];
configureFlags = [

View file

@ -7,7 +7,7 @@
, freetype
, gsettings-desktop-schemas
, gtk3
, libsoup
, libsoup_2_4
, stdenv
, yarnConfigHook
, yarnBuildHook
@ -95,7 +95,7 @@ rustPlatform.buildRustPackage {
dbus
openssl
freetype
libsoup
libsoup_2_4
gtk3
webkitgtk_4_0
gsettings-desktop-schemas

View file

@ -9,7 +9,7 @@
, itstool
, wrapGAppsHook3
, desktop-file-utils
, libsoup
, libsoup_2_4
, json-glib
, geoclue2
, geocode-glib
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libsoup
libsoup_2_4
json-glib
geoclue2
geocode-glib

View file

@ -10,7 +10,7 @@
, gtk-doc
, docbook-xsl-nons
, glib
, libsoup
, libsoup_2_4
}:
stdenv.mkDerivation rec {
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
libsoup
libsoup_2_4
];
meta = with lib; {

View file

@ -1,5 +1,5 @@
{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl
, libgee, libsoup, fcgi }:
, libgee, libsoup_2_4, fcgi }:
stdenv.mkDerivation rec {
pname = "valum";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ glib vala ctpl libgee libsoup fcgi ];
buildInputs = [ glib vala ctpl libgee libsoup_2_4 fcgi ];
meta = with lib; {
homepage = "https://github.com/valum-framework/valum";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking
{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup_2_4, webkitgtk_4_0, gtk3, glib-networking
, gsettings-desktop-schemas, wrapGAppsHook3
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ wrapGAppsHook3 pkg-config ];
buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ];
buildInputs = [ gtk3 libsoup_2_4 webkitgtk_4_0 glib-networking gsettings-desktop-schemas ];
passthru = {
inherit gtk3;

View file

@ -5,7 +5,7 @@
, fetchYarnDeps
, freetype
, gtk3
, libsoup
, libsoup_2_4
, stdenvNoCC
, yarnConfigHook
, yarnBuildHook
@ -74,7 +74,7 @@ rustPlatform.buildRustPackage {
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ];
buildInputs = [ dbus openssl freetype libsoup_2_4 gtk3 webkitgtk_4_0 ];
checkFlags = [
# tries to mutate the parent directory

View file

@ -42,7 +42,7 @@ lib.makeScope pkgs.newScope (self: with self; {
pangomm = throw "gnome2.pangomm has been removed, please use top-level pangomm";
gtkmm2 = throw "gnome2.gtkmm2 has been removed, please use top-level gtkmm2";
libcanberra-gtk2 = throw "gnome2.libcanberra-gtk2 has been removed, please use top-level libcanberra-gtk2";
libsoup = throw "gnome2.libsoup has been removed, please use top-level libsoup";
libsoup = throw "gnome2.libsoup has been removed, please use top-level libsoup_2_4";
libwnck2 = throw "gnome2.libwnck2 has been removed, please use top-level libwnck2";
gtk-doc = throw "gnome2.gtk-doc has been removed, please use top-level gtk-doc";
gnome-doc-utils = throw "gnome2.gnome-doc-utils has been removed, please use top-level gnome-doc-utils";

View file

@ -7,7 +7,7 @@
, glib-networking
, libxml2
, gtk3
, libsoup
, libsoup_2_4
, tzdata
, mateUpdateScript
}:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libsoup
libsoup_2_4
tzdata
];

View file

@ -19,7 +19,7 @@
, libgit2-glib
, libhandy
, libpeas
, libsoup
, libsoup_2_4
, vte
, ctags
}:
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
libgit2-glib
libhandy
libpeas
libsoup
libsoup_2_4
vte
];

View file

@ -17,7 +17,7 @@
, elementary-dock
, bamf
, switchboard-with-plugs
, libsoup
, libsoup_2_4
, wingpanel
, zeitgeist
, bc
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
json-glib
libgee
libhandy
libsoup
libsoup_2_4
switchboard-with-plugs
wingpanel
zeitgeist

View file

@ -15,7 +15,7 @@
, libgee
, libhandy
, libxml2
, libsoup
, libsoup_2_4
, elementary-calendar
}:
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
libgee
libhandy
libical
libsoup
libsoup_2_4
wingpanel
];

View file

@ -7,7 +7,7 @@
, gtk3
, json_c
, libxml2
, libsoup
, libsoup_2_4
, upower
, libxfce4ui
, libxfce4util
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
gtk3
json_c
libxml2
libsoup
libsoup_2_4
upower
libxfce4ui
libxfce4util

View file

@ -124461,7 +124461,7 @@ self: {
"gi-soup" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
, haskell-gi-overloading, libsoup, text, transformers
, haskell-gi-overloading, libsoup_2_4, text, transformers
}:
mkDerivation {
pname = "gi-soup";
@ -124474,15 +124474,15 @@ self: {
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ libsoup ];
libraryPkgconfigDepends = [ libsoup_2_4 ];
description = "Libsoup bindings";
license = lib.licenses.lgpl21Only;
}) {inherit (pkgs) libsoup;};
}) {inherit (pkgs) libsoup_2_4;};
"gi-soup_3_0_3" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
, haskell-gi-overloading, libsoup, text, transformers
, haskell-gi-overloading, libsoup_3, text, transformers
}:
mkDerivation {
pname = "gi-soup";
@ -124495,11 +124495,11 @@ self: {
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ libsoup ];
libraryPkgconfigDepends = [ libsoup_3 ];
description = "Libsoup bindings";
license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) libsoup;};
}) {inherit (pkgs) libsoup_3;};
"gi-vips" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@ -227267,33 +227267,18 @@ self: {
}) {};
"opencascade-hs" = callPackage
({ mkDerivation, base, resourcet, TKBO, TKBRep, TKDEGLTF, TKDEOBJ
, TKDESTEP, TKDESTL, TKernel, TKFillet, TKG2d, TKG3d, TKGeomBase
, TKLCAF, TKMath, TKMesh, TKOffset, TKPrim, TKRWMesh, TKService
, TKShHealing, TKStd, TKTopAlgo, TKV3d, TKXCAF, TKXSBase
}:
({ mkDerivation, base, opencascade-occt, resourcet }:
mkDerivation {
pname = "opencascade-hs";
version = "0.4.0.0";
sha256 = "1dhasjjhcg54qihcihid69z70l75dn7xsbsd765lsgzc35m1qbrl";
libraryHaskellDepends = [ base resourcet ];
librarySystemDepends = [
TKBO TKBRep TKDEGLTF TKDEOBJ TKDESTEP TKDESTL TKernel TKFillet
TKG2d TKG3d TKGeomBase TKLCAF TKMath TKMesh TKOffset TKPrim
TKRWMesh TKService TKShHealing TKStd TKTopAlgo TKV3d TKXCAF
TKXSBase
];
librarySystemDepends = [ opencascade-occt ];
description = "Thin Wrapper for the OpenCASCADE CAD Kernel";
license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {TKBO = null; TKBRep = null; TKDEGLTF = null; TKDEOBJ = null;
TKDESTEP = null; TKDESTL = null; TKFillet = null; TKG2d = null;
TKG3d = null; TKGeomBase = null; TKLCAF = null; TKMath = null;
TKMesh = null; TKOffset = null; TKPrim = null; TKRWMesh = null;
TKService = null; TKShHealing = null; TKStd = null;
TKTopAlgo = null; TKV3d = null; TKXCAF = null; TKXSBase = null;
TKernel = null;};
}) {inherit (pkgs) opencascade-occt;};
"opencc" = callPackage
({ mkDerivation, base, bytestring, mtl, opencc, text, transformers
@ -289360,8 +289345,8 @@ self: {
"spike" = callPackage
({ mkDerivation, base, containers, directory, filepath, glib
, global-variables, gtk, libsoup, mtl, process, random, rosezipper
, stm, webkit
, global-variables, gtk, libsoup_2_4, mtl, process, random
, rosezipper, stm, webkit
}:
mkDerivation {
pname = "spike";
@ -289373,12 +289358,12 @@ self: {
base containers directory filepath glib global-variables gtk mtl
process random rosezipper stm webkit
];
executablePkgconfigDepends = [ libsoup ];
executablePkgconfigDepends = [ libsoup_2_4 ];
description = "Experimental web browser";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "spike";
}) {inherit (pkgs) libsoup;};
}) {inherit (pkgs) libsoup_2_4;};
"spine" = callPackage
({ mkDerivation, base }:

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup_2_4, gobject-introspection }:
stdenv.mkDerivation {
pname = "gsignond-plugin-lastfm";
@ -23,7 +23,7 @@ stdenv.mkDerivation {
glib
gsignond
json-glib
libsoup
libsoup_2_4
];
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check
, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
, json-glib, libsoup_2_4, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
, docbook_xsl, glibcLocales, gobject-introspection }:
stdenv.mkDerivation {
@ -31,7 +31,7 @@ stdenv.mkDerivation {
gnutls
gsignond
json-glib
libsoup
libsoup_2_4
];
LC_ALL = "en_US.UTF-8";

View file

@ -9,7 +9,7 @@
, vala
, gi-docgen
, python3
, libsoup
, libsoup_2_4
, glib
, gnome
, gssdp-tools
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libsoup
libsoup_2_4
];
propagatedBuildInputs = [

View file

@ -13,7 +13,7 @@
, docbook_xml_dtd_45
, glib
, gssdp
, libsoup
, libsoup_2_4
, libxml2
, libuuid
, gnome
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
glib
gssdp
libsoup
libsoup_2_4
libxml2
];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc
, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome, buildPackages
, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup_2_4, gnome, buildPackages
, Foundation, AppKit
}:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
libxml2
libsoup
libsoup_2_4
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Foundation
AppKit

View file

@ -3,7 +3,7 @@
, fetchurl
, pkg-config
, glib
, libsoup
, libsoup_2_4
, libxml2
, gobject-introspection
, gtk-doc
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
glib
libsoup
libsoup_2_4
libxml2
];

View file

@ -9,7 +9,7 @@
, installShellFiles
, jq
, libayatana-appindicator
, libsoup
, libsoup_2_4
, makeDesktopItem
, mkYarnPackage
, openssl
@ -141,7 +141,7 @@ rec {
];
buildInputs = [
libsoup
libsoup_2_4
openssl
] ++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3

View file

@ -32,7 +32,7 @@
, gnutar
, json-glib
, libcap
, libsoup
, libsoup_2_4
, libyaml
, ostree
, patch
@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
glib
json-glib
libcap
libsoup
libsoup_2_4
libxml2
libyaml
ostree

View file

@ -112,7 +112,7 @@ buildFHSEnv {
libpulseaudio
libselinux
libsndfile
libsoup
libsoup_2_4
libtheora
libtiff
libunwind

View file

@ -27,7 +27,7 @@
, openresolv
, libndp
, newt
, libsoup
, libsoup_2_4
, ethtool
, gnused
, iputils
@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
modemmanager
readline
newt
libsoup
libsoup_2_4
jansson
dbus # used to get directory paths with pkg-config during configuration
];

View file

@ -660,6 +660,7 @@ mapAliases {
librewolf-wayland = librewolf; # Added 2022-11-15
libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
libsForQt515 = libsForQt5; # Added 2022-11-24
libsoup = lib.warnOnInstantiate "libsoup has been renamed to libsoup_2_4" libsoup_2_4; # Added 2024-12-02
libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
libtensorflow-bin = libtensorflow; # Added 2022-09-25
libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17

View file

@ -9105,7 +9105,7 @@ with pkgs;
geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
geocode-glib_2 = geocode-glib.override {
libsoup = libsoup_3;
libsoup_2_4 = libsoup_3;
};
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
@ -10006,7 +10006,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox;
};
libsoup = callPackage ../development/libraries/libsoup { };
libsoup_2_4 = callPackage ../development/libraries/libsoup { };
libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { };
@ -11035,6 +11035,7 @@ with pkgs;
webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzzFull;
libsoup = libsoup_2_4;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
inherit (darwin) apple_sdk;
};

View file

@ -578,7 +578,7 @@
},
"libsoup-gnome-2.4": {
"attrPath": [
"libsoup"
"libsoup_2_4"
]
},
"libssh2": {