From f8b7ca29263c515c493ec547f1821ff8bff7a7de Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:45:16 +0100 Subject: [PATCH 01/10] quodlibet: Auto-inject libsoup_3 dependency --- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 7a0063238d492..d4d8b736acc2e 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -20,7 +20,7 @@ libappindicator-gtk3, libmodplug, librsvg, - libsoup, + libsoup_3, webkitgtk_4_0, # optional features @@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication { keybinder3 libappindicator-gtk3 libmodplug - libsoup + libsoup_3 webkitgtk_4_0 ] ++ lib.optionals (withXineBackend) [ xine-lib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb4126e3f906c..c8e419e1aa552 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15399,17 +15399,14 @@ with pkgs; keybinder3 = null; libappindicator-gtk3 = null; libmodplug = null; - libsoup = libsoup_3; }; quodlibet-without-gst-plugins = quodlibet.override { - libsoup = libsoup_3; tag = "-without-gst-plugins"; withGstPlugins = false; }; quodlibet-xine = quodlibet.override { - libsoup = libsoup_3; tag = "-xine"; withGstreamerBackend = false; withXineBackend = true; @@ -15421,7 +15418,6 @@ with pkgs; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; libmodplug = libmodplug; - libsoup = libsoup_3; tag = "-full"; withDbusPython = true; withMusicBrainzNgs = true; @@ -15431,7 +15427,6 @@ with pkgs; }; quodlibet-xine-full = quodlibet-full.override { - libsoup = libsoup_3; tag = "-xine-full"; withGstreamerBackend = false; withXineBackend = true; From 57eaa33dcdf440d8a349af92856faff1100f8334 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:46:16 +0100 Subject: [PATCH 02/10] quodlibet: Remove webkitgtk dependency It is unused since 4.5.0: https://github.com/quodlibet/quodlibet/commit/b973220cccc9f3cdb411e68f595d2c79bf4bf76a --- pkgs/applications/audio/quodlibet/default.nix | 2 -- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index d4d8b736acc2e..ee2b4f8a842bd 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -21,7 +21,6 @@ libmodplug, librsvg, libsoup_3, - webkitgtk_4_0, # optional features withDbusPython ? false, @@ -90,7 +89,6 @@ python3.pkgs.buildPythonApplication { libappindicator-gtk3 libmodplug libsoup_3 - webkitgtk_4_0 ] ++ lib.optionals (withXineBackend) [ xine-lib ] ++ lib.optionals (withGstreamerBackend) ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8e419e1aa552..8c7e272bba8c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15413,7 +15413,7 @@ with pkgs; }; quodlibet-full = quodlibet.override { - inherit gtksourceview webkitgtk_4_0; + inherit gtksourceview; kakasi = kakasi; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; From 64bb13690a0328f93bbb5b6826247fd9aff300bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:48:39 +0100 Subject: [PATCH 03/10] wealthfolio: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/we/wealthfolio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index a3586299ad253..fd9b1311182c2 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cargo-tauri, - libsoup, + libsoup_3, nodejs, openssl, pkg-config, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libsoup + libsoup_3 openssl webkitgtk_4_1 ]; From 4bd5b632af73f79657af7646950c0a9fc81f8e0a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:48:45 +0100 Subject: [PATCH 04/10] snx-rs: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/sn/snx-rs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 29468c2f669f9..caf3f333e812e 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup, webkitgtk_4_1 }: +{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup_3, webkitgtk_4_1 }: rustPlatform.buildRustPackage { pname = "snx-rs"; version = "2.2.3"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl glib atk gtk3 libsoup webkitgtk_4_1 ]; + buildInputs = [ openssl glib atk gtk3 libsoup_3 webkitgtk_4_1 ]; checkFlags = [ "--skip=platform::linux::net::tests::test_default_ip" From c2243585486fe159c5f291468727bc4c3828fea2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:48:57 +0100 Subject: [PATCH 05/10] spacedrive: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/sp/spacedrive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index db17baa6534bc..fb1e74801f9c2 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -10,7 +10,7 @@ gdk-pixbuf, glib, gst_all_1, - libsoup, + libsoup_3, webkitgtk_4_1, xdotool, }: @@ -106,7 +106,7 @@ else buildInputs = [ xdotool glib - libsoup + libsoup_3 webkitgtk_4_1 gdk-pixbuf gst_all_1.gst-plugins-ugly From d4b9c479c51c0189eeceb909da5c626f12dfbca5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:49:08 +0100 Subject: [PATCH 06/10] overlayed: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/ov/overlayed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index 05cf017825a71..be11066b305e5 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -4,7 +4,7 @@ callPackage, pkg-config, openssl, - libsoup, + libsoup_3, webkitgtk_4_1, fetchFromGitHub, libayatana-appindicator, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl webkitgtk_4_1 - libsoup + libsoup_3 ]; env = { From fda49c9a0c02834aa3ccfefaa9a8dd1938978a7b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 22:42:17 +0100 Subject: [PATCH 07/10] nghttp2: Use libsoup_3 in passthru.tests libsoup 2.4 is actually not using this library, only libsoup_3 is. --- pkgs/by-name/ng/nghttp2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index 64e1e255c30bc..f17bd6487dddc 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -18,7 +18,7 @@ # downstream dependencies, for testing , curl -, libsoup +, libsoup_3 }: # Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch! @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit curl libsoup; + inherit curl libsoup_3; }; meta = with lib; { From efd71e15283ec6f686bff5f0070d7ed6cfee567d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:57:46 +0100 Subject: [PATCH 08/10] gnome2: Remove rest of the aliases No-one should be using gnome2 nowadays. --- pkgs/desktops/gnome-2/default.nix | 45 +++++++++++++++++-------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 67af761d3a383..b2316891f9424 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -32,27 +32,32 @@ lib.makeScope pkgs.newScope (self: with self; { }; } // lib.optionalAttrs config.allowAliases { - inherit (pkgs) - # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gtkmm2 libcanberra-gtk2 + # added 2024-12-02 + glib = throw "gnome2.glib has been removed, please use top-level glib"; + glibmm = throw "gnome2.glibmm has been removed, please use top-level glibmm"; + atk = throw "gnome2.atk has been removed, please use top-level atk"; + atkmm = throw "gnome2.atkmm has been removed, please use top-level atkmm"; + cairo = throw "gnome2.cairo has been removed, please use top-level cairo"; + pango = throw "gnome2.pango has been removed, please use top-level pango"; + 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"; + 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"; + gvfs = throw "gnome2.gvfs has been removed, please use top-level gvfs"; + gtk = throw "gnome2.gtk has been removed, please use top-level gtk2"; + gtkmm = throw "gnome2.gtkmm has been removed, please use top-level gtkmm2"; + gtkdoc = throw "gnome2.gtkdoc has been removed, please use top-level gtk-doc"; + startup_notification = throw "gnome2.startup_notification has been removed, please use top-level libstartup_notification"; + startupnotification = throw "gnome2.startupnotification has been removed, please use top-level libstartup_notification"; + gnomedocutils = throw "gnome2.gnomedocutils has been removed, please use top-level gnome-doc-utils"; + gnome-icon-theme = throw "gnome2.gnome-icon-theme has been removed, please use top-level gnome-icon-theme"; + gnome_icon_theme = throw "gnome2.gnome_icon_theme has been removed, please use top-level gnome-icon-theme"; + gnomeicontheme = throw "gnome2.gnomeicontheme has been removed, please use top-level gnome-icon-theme"; + gnome_common = throw "gnome2.gnome_common has been removed, please use top-level gnome-common"; - # Included for backwards compatibility - libsoup libwnck2 gtk-doc gnome-doc-utils - - gvfs # added 2019-09-03 - ; - - gtk = pkgs.gtk2; - gtkmm = pkgs.gtkmm2; - - gtkdoc = pkgs.gtk-doc; - startup_notification = pkgs.libstartup_notification; - startupnotification = pkgs.libstartup_notification; - gnomedocutils = pkgs.gnome-doc-utils; - gnome-icon-theme = pkgs.gnome-icon-theme; - gnome_icon_theme = self.gnome-icon-theme; - gnomeicontheme = self.gnome-icon-theme; - gnome_common = gnome-common; gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14 gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27 From e001fb0270024bc0ea8f53509ed9eee045329804 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 4 Dec 2024 12:33:15 +0100 Subject: [PATCH 09/10] haskellPackages.cabal2nix-unstable: 2024-10-17 -> 2024-12-04 This emits versioned libsoup_* attributes in hackage-packages.nix and (unrelatedly) adds support for opencascade-*, thus closes #359831. --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 3e925417d644e..41c4a36ec2eef 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-10-17"; + version = "unstable-2024-12-04"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/b8eb82f8bc907b42dfb463cab62e49fbe2fff997.tar.gz"; - sha256 = "1fxqigr002ssgz1l62rc7k04q4q0hwcl2wqy7l2shylxqf7yfcd6"; + url = "https://github.com/NixOS/cabal2nix/archive/af1bc25377f7a44e008def494bda77a83578d9be.tar.gz"; + sha256 = "0jjsy77vm88x81a5pwq5nhgnbiywjza8qyjsr2kclsdh860m3hmp"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; From 93558e0e59d20aba5ac22403ee399a66527e8fe1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 23:27:07 +0100 Subject: [PATCH 10/10] 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. --- pkgs/applications/audio/pragha/default.nix | 4 +- .../graphics/inkscape/default.nix | 4 +- .../networking/browsers/surf/default.nix | 4 +- .../instant-messengers/dino/default.nix | 6 +-- .../remote/citrix-workspace/generic.nix | 4 +- pkgs/applications/office/grisbi/default.nix | 4 +- pkgs/by-name/al/alcom/package.nix | 4 +- pkgs/by-name/an/ansel/package.nix | 4 +- pkgs/by-name/ar/ario/package.nix | 4 +- pkgs/by-name/aw/aws-workspaces/package.nix | 4 +- pkgs/by-name/ca/cargo-tauri_1/package.nix | 4 +- .../ca/catppuccinifier-gui/package.nix | 4 +- pkgs/by-name/da/darktable/package.nix | 4 +- pkgs/by-name/de/desktop-postflop/package.nix | 4 +- pkgs/by-name/dl/dleyna-renderer/package.nix | 4 +- pkgs/by-name/dl/dleyna-server/package.nix | 4 +- pkgs/by-name/en/en-croissant/package.nix | 4 +- pkgs/by-name/fo/fondo/package.nix | 4 +- pkgs/by-name/ga/gamehub/package.nix | 4 +- pkgs/by-name/ge/geocode-glib/package.nix | 6 +-- pkgs/by-name/gf/gfbgraph/package.nix | 4 +- pkgs/by-name/gi/gitbutler/package.nix | 4 +- pkgs/by-name/gn/gnome-recipes/package.nix | 4 +- pkgs/by-name/gp/gpauth/package.nix | 4 +- pkgs/by-name/gt/gthumb/package.nix | 4 +- pkgs/by-name/ha/hardinfo/package.nix | 4 +- pkgs/by-name/hq/hqplayerd/rygel.nix | 4 +- pkgs/by-name/in/insulator2/package.nix | 4 +- pkgs/by-name/in/intune-portal/package.nix | 4 +- pkgs/by-name/li/libchamplain/package.nix | 4 +- pkgs/by-name/li/libepc/package.nix | 4 +- pkgs/by-name/li/libgdata/package.nix | 4 +- .../by-name/li/libhttpseverywhere/package.nix | 4 +- .../li/libxplayer-plparser/package.nix | 4 +- pkgs/by-name/li/libzapojit/package.nix | 4 +- pkgs/by-name/ma/markets/package.nix | 4 +- pkgs/by-name/me/meteo/package.nix | 4 +- pkgs/by-name/mi/midori-unwrapped/package.nix | 4 +- pkgs/by-name/mo/mouse-actions-gui/package.nix | 4 +- pkgs/by-name/os/osm-gps-map/package.nix | 4 +- pkgs/by-name/os/ostree/package.nix | 4 +- pkgs/by-name/po/pot/package.nix | 4 +- pkgs/by-name/sp/spice-up/package.nix | 4 +- pkgs/by-name/sq/squirreldisk/package.nix | 4 +- pkgs/by-name/ta/taxi/package.nix | 4 +- pkgs/by-name/te/telepathy-gabble/package.nix | 4 +- pkgs/by-name/ti/timezonemap/package.nix | 4 +- pkgs/by-name/tr/treedome/package.nix | 4 +- pkgs/by-name/tu/tuner/package.nix | 4 +- pkgs/by-name/uh/uhttpmock/package.nix | 4 +- pkgs/by-name/va/valum/package.nix | 4 +- pkgs/by-name/vi/vimb-unwrapped/package.nix | 4 +- pkgs/by-name/xp/xplorer/package.nix | 4 +- pkgs/desktops/gnome-2/default.nix | 2 +- pkgs/desktops/mate/libmateweather/default.nix | 4 +- .../pantheon/apps/elementary-code/default.nix | 4 +- .../applications-menu/default.nix | 4 +- .../wingpanel-indicators/datetime/default.nix | 4 +- .../xfce4-weather-plugin/default.nix | 4 +- .../haskell-modules/hackage-packages.nix | 41 ++++++------------- .../libraries/gsignond/plugins/lastfm.nix | 4 +- .../libraries/gsignond/plugins/oauth.nix | 4 +- pkgs/development/libraries/gssdp/default.nix | 4 +- pkgs/development/libraries/gupnp/default.nix | 4 +- .../development/libraries/libgrss/default.nix | 4 +- .../development/libraries/librest/default.nix | 4 +- pkgs/development/tools/devpod/default.nix | 4 +- .../tools/flatpak-builder/default.nix | 4 +- pkgs/games/heroic/fhsenv.nix | 2 +- .../networking/networkmanager/default.nix | 4 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ++- .../top-level/pkg-config/pkg-config-data.json | 2 +- 73 files changed, 156 insertions(+), 169 deletions(-) diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix index 00c442e7f58c2..8cb57f200d2e9 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/applications/audio/pragha/default.nix @@ -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 diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 62f485ff916ee..d80b7e8202619 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -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 diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 990036a8045e6..3e98ff068c97d 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -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 diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index dd5f8f54c7455..147db575ae634 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -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" diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 015a723d116a9..fc39b4ce622f8 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -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 diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 911ed9715320d..16c2652be5267 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -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 ]; diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index f61070487d0dd..4c8351d0a650d 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -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 diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 67ee8d878706c..f8a33a0c4041c 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -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 diff --git a/pkgs/by-name/ar/ario/package.nix b/pkgs/by-name/ar/ario/package.nix index 2231031d04816..cf4065a8e9d15 100644 --- a/pkgs/by-name/ar/ario/package.nix +++ b/pkgs/by-name/ar/ario/package.nix @@ -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 ]; diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index 9598f6118cb10..5dad383078962 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -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 diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 7ee93d6642ccc..3ec0a69ddcbd6 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -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 ]; diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index 101ba9bb74ceb..7c3c44b13791b 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -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 diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index e3a32dba46582..ee1a83dd1da9a 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -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 diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix index 0eb643a44b041..98136e89ea97b 100644 --- a/pkgs/by-name/de/desktop-postflop/package.nix +++ b/pkgs/by-name/de/desktop-postflop/package.nix @@ -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 ]; diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix index 61574df27c19d..cefe7e90fd0f0 100644 --- a/pkgs/by-name/dl/dleyna-renderer/package.nix +++ b/pkgs/by-name/dl/dleyna-renderer/package.nix @@ -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 = '' diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix index cec03d84c6499..ff24f5bf7c568 100644 --- a/pkgs/by-name/dl/dleyna-server/package.nix +++ b/pkgs/by-name/dl/dleyna-server/package.nix @@ -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 = '' diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 62acfc4a55bc4..6b8ea3e50f11e 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -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 diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix index 16fcd734286a3..daaeb2b74f9bc 100644 --- a/pkgs/by-name/fo/fondo/package.nix +++ b/pkgs/by-name/fo/fondo/package.nix @@ -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 ]; diff --git a/pkgs/by-name/ga/gamehub/package.nix b/pkgs/by-name/ga/gamehub/package.nix index 4367de30f5d95..731a8678f2cf9 100644 --- a/pkgs/by-name/ga/gamehub/package.nix +++ b/pkgs/by-name/ga/gamehub/package.nix @@ -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 diff --git a/pkgs/by-name/ge/geocode-glib/package.nix b/pkgs/by-name/ge/geocode-glib/package.nix index c33b2cd6d3914..b459ad08f6624 100644 --- a/pkgs/by-name/ge/geocode-glib/package.nix +++ b/pkgs/by-name/ge/geocode-glib/package.nix @@ -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"}" ]; diff --git a/pkgs/by-name/gf/gfbgraph/package.nix b/pkgs/by-name/gf/gfbgraph/package.nix index b099a2dd10e31..2affe005284c3 100644 --- a/pkgs/by-name/gf/gfbgraph/package.nix +++ b/pkgs/by-name/gf/gfbgraph/package.nix @@ -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 ]; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index c3ee127b2bd9e..e6abb70723ce3 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -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 ( diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix index ecc6413fe0f19..09a38f2cc506d 100644 --- a/pkgs/by-name/gn/gnome-recipes/package.nix +++ b/pkgs/by-name/gn/gnome-recipes/package.nix @@ -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 diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index a98459bbc0d12..5fb94061db923 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -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 ]; diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix index f2666b3ee1076..4424c109711ba 100644 --- a/pkgs/by-name/gt/gthumb/package.nix +++ b/pkgs/by-name/gt/gthumb/package.nix @@ -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 diff --git a/pkgs/by-name/ha/hardinfo/package.nix b/pkgs/by-name/ha/hardinfo/package.nix index 462ef09aca04c..808a36a015ec6 100644 --- a/pkgs/by-name/ha/hardinfo/package.nix +++ b/pkgs/by-name/ha/hardinfo/package.nix @@ -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" ]; diff --git a/pkgs/by-name/hq/hqplayerd/rygel.nix b/pkgs/by-name/hq/hqplayerd/rygel.nix index a76680dfff8bc..bf360c3f8cc1c 100644 --- a/pkgs/by-name/hq/hqplayerd/rygel.nix +++ b/pkgs/by-name/hq/hqplayerd/rygel.nix @@ -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 diff --git a/pkgs/by-name/in/insulator2/package.nix b/pkgs/by-name/in/insulator2/package.nix index 876f89b4ca1a6..ad02d51aecdfc 100644 --- a/pkgs/by-name/in/insulator2/package.nix +++ b/pkgs/by-name/in/insulator2/package.nix @@ -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 ]; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index dbd3e3393529a..009be9ce46deb 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -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 diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix index f49d12e639db3..fc228f4d6a944 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain/package.nix @@ -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 = [ diff --git a/pkgs/by-name/li/libepc/package.nix b/pkgs/by-name/li/libepc/package.nix index 11cc35b2e5098..3387e20ce6997 100644 --- a/pkgs/by-name/li/libepc/package.nix +++ b/pkgs/by-name/li/libepc/package.nix @@ -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; diff --git a/pkgs/by-name/li/libgdata/package.nix b/pkgs/by-name/li/libgdata/package.nix index 3f7242aedd335..ed706ee9b78c0 100644 --- a/pkgs/by-name/li/libgdata/package.nix +++ b/pkgs/by-name/li/libgdata/package.nix @@ -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 diff --git a/pkgs/by-name/li/libhttpseverywhere/package.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix index 80bc73e9a0434..50072b6cbef36 100644 --- a/pkgs/by-name/li/libhttpseverywhere/package.nix +++ b/pkgs/by-name/li/libhttpseverywhere/package.nix @@ -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 diff --git a/pkgs/by-name/li/libxplayer-plparser/package.nix b/pkgs/by-name/li/libxplayer-plparser/package.nix index 9a1ef21c014e6..51358b45bbda0 100644 --- a/pkgs/by-name/li/libxplayer-plparser/package.nix +++ b/pkgs/by-name/li/libxplayer-plparser/package.nix @@ -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; { diff --git a/pkgs/by-name/li/libzapojit/package.nix b/pkgs/by-name/li/libzapojit/package.nix index cb7038d5355ce..5de315b794570 100644 --- a/pkgs/by-name/li/libzapojit/package.nix +++ b/pkgs/by-name/li/libzapojit/package.nix @@ -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 { diff --git a/pkgs/by-name/ma/markets/package.nix b/pkgs/by-name/ma/markets/package.nix index e24e902abc036..5365dea34609b 100644 --- a/pkgs/by-name/ma/markets/package.nix +++ b/pkgs/by-name/ma/markets/package.nix @@ -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 = '' diff --git a/pkgs/by-name/me/meteo/package.nix b/pkgs/by-name/me/meteo/package.nix index e62d4edfe97fe..226c8078c64e1 100644 --- a/pkgs/by-name/me/meteo/package.nix +++ b/pkgs/by-name/me/meteo/package.nix @@ -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 ]; diff --git a/pkgs/by-name/mi/midori-unwrapped/package.nix b/pkgs/by-name/mi/midori-unwrapped/package.nix index 3a2a670353285..74f25b636df0c 100644 --- a/pkgs/by-name/mi/midori-unwrapped/package.nix +++ b/pkgs/by-name/mi/midori-unwrapped/package.nix @@ -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 diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 7fae4355255bc..f0ea612c309b7 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -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 ]; diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 0be196597c903..5beaf910e425d 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -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; { diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index fd09015f67c76..dff3820b4112e 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -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 diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index 15331dfcef9d9..4285db9048c23 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -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 diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix index f8a7f3a7c268c..ca99f88fa57b6 100644 --- a/pkgs/by-name/sp/spice-up/package.nix +++ b/pkgs/by-name/sp/spice-up/package.nix @@ -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 ]; diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index 4ed9647730635..d0ea01ba160f7 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -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; diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix index 9552afd1a635c..2b39d517560a0 100644 --- a/pkgs/by-name/ta/taxi/package.nix +++ b/pkgs/by-name/ta/taxi/package.nix @@ -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 ]; diff --git a/pkgs/by-name/te/telepathy-gabble/package.nix b/pkgs/by-name/te/telepathy-gabble/package.nix index dc4b11caf0b90..d2e2676af5add 100644 --- a/pkgs/by-name/te/telepathy-gabble/package.nix +++ b/pkgs/by-name/te/telepathy-gabble/package.nix @@ -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 ]; diff --git a/pkgs/by-name/ti/timezonemap/package.nix b/pkgs/by-name/ti/timezonemap/package.nix index f2ceb056f25a8..de7915b5f67bd 100644 --- a/pkgs/by-name/ti/timezonemap/package.nix +++ b/pkgs/by-name/ti/timezonemap/package.nix @@ -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 = [ diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index bd355787d4877..64b086fd1733a 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -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 diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix index 8637340f38262..e4834143db8ce 100644 --- a/pkgs/by-name/tu/tuner/package.nix +++ b/pkgs/by-name/tu/tuner/package.nix @@ -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 diff --git a/pkgs/by-name/uh/uhttpmock/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix index 710979057d439..6fcee7fb8d536 100644 --- a/pkgs/by-name/uh/uhttpmock/package.nix +++ b/pkgs/by-name/uh/uhttpmock/package.nix @@ -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; { diff --git a/pkgs/by-name/va/valum/package.nix b/pkgs/by-name/va/valum/package.nix index caf29a2cc027f..2602324e89239 100644 --- a/pkgs/by-name/va/valum/package.nix +++ b/pkgs/by-name/va/valum/package.nix @@ -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"; diff --git a/pkgs/by-name/vi/vimb-unwrapped/package.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix index e02e07419ea16..0a629030f2107 100644 --- a/pkgs/by-name/vi/vimb-unwrapped/package.nix +++ b/pkgs/by-name/vi/vimb-unwrapped/package.nix @@ -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; diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix index 6af5e5da6cf1d..018b5bd3060d4 100644 --- a/pkgs/by-name/xp/xplorer/package.nix +++ b/pkgs/by-name/xp/xplorer/package.nix @@ -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 diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index b2316891f9424..061e0306b9d59 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -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"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4c003c4a9873b..68cf463f75946 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -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 ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 5cab3288bd350..29404706ac67d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -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 ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 12746579c4991..c2b6f314f838a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -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 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index a413498447ba1..bd87eef9115da 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -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 ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index db7614394cb6c..9d8d80fed1069 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d51851b2c4717..e63f422c123a2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -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 }: diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 7f58b4d11ce32..8ba7c0483dc6d 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -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"; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 06999b225de14..0261c39a8740b 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -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"; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index a838efc15a708..d3ecb89139474 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 5fa0df314274a..4835047a3edd0 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index c6de97101be8e..d2ac5a83602a2 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -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 diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index de0ff52f1e1bf..22e5309591058 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 2236d27be2b36..4d4efc7b3608e 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -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 diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 8d01cbeb5db8d..ae3c3ce32192e 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -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 diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 9f3cdb067fdec..f5b7469388457 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -112,7 +112,7 @@ buildFHSEnv { libpulseaudio libselinux libsndfile - libsoup + libsoup_2_4 libtheora libtiff libunwind diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index fbc7ec0857b58..fa91b2c64dca6 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -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 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61f8f88d0745d..e1d9ed62d4779 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -654,6 +654,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c7e272bba8c2..c173f7ca026ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9143,7 +9143,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) { @@ -10044,7 +10044,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 { }; @@ -11073,6 +11073,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; }; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 4c2286a47e90e..60981baa69cfe 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -578,7 +578,7 @@ }, "libsoup-gnome-2.4": { "attrPath": [ - "libsoup" + "libsoup_2_4" ] }, "libssh2": {