Skip to content

Commit 2476dd6

Browse files
jtojnarsternenseemann
authored andcommitted
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. 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 NixOS#359831.
1 parent c3b2190 commit 2476dd6

File tree

75 files changed

+161
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+161
-174
lines changed

doc/hooks/tauri.section.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases.
1616
cargo-tauri,
1717
darwin,
1818
glib-networking,
19-
libsoup,
19+
libsoup_2_4,
2020
nodejs,
2121
npmHooks,
2222
openssl,
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
5454
[ openssl ]
5555
++ lib.optionals stdenv.hostPlatform.isLinux [
5656
glib-networking # Most Tauri apps need networking
57-
libsoup
57+
libsoup_2_4
5858
webkitgtk_4_0
5959
]
6060
++ lib.optionals stdenv.hostPlatform.isDarwin (

pkgs/applications/audio/pragha/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
, libcdio-paranoia, withCD ? true
2323
, keybinder3, withKeybinder ? false
2424
, libnotify, withLibnotify ? false
25-
, libsoup, withLibsoup ? false
25+
, libsoup_2_4, withLibsoup ? false
2626
, libgudev, withGudev ? false # experimental
2727
, libmtp, withMtp ? false # experimental
2828
, xfce, withXfce4ui ? false
@@ -73,7 +73,7 @@ mkDerivation rec {
7373
++ lib.optional withLibnotify libnotify
7474
++ lib.optional withLastfm liblastfmSF
7575
++ lib.optional withGlyr glyr
76-
++ lib.optional withLibsoup libsoup
76+
++ lib.optional withLibsoup libsoup_2_4
7777
++ lib.optional withMtp libmtp
7878
++ lib.optional withXfce4ui xfce.libxfce4ui
7979
++ lib.optional withTotemPlParser totem-pl-parser

pkgs/applications/graphics/inkscape/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
, librevenge
2828
, librsvg
2929
, libsigcxx
30-
, libsoup
30+
, libsoup_2_4
3131
, libvisio
3232
, libwpg
3333
, libXft
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
155155
librevenge
156156
librsvg # for loading icons
157157
libsigcxx
158-
libsoup
158+
libsoup_2_4
159159
libvisio
160160
libwpg
161161
libXft

pkgs/applications/networking/browsers/surf/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ lib, stdenv, fetchgit
22
, pkg-config, wrapGAppsHook3
3-
, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0
3+
, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup_2_4, webkitgtk_4_0
44
, xorg, dmenu, findutils, gnused, coreutils, gst_all_1
55
, patches ? null
66
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
glib-networking
2424
gsettings-desktop-schemas
2525
gtk
26-
libsoup
26+
libsoup_2_4
2727
webkitgtk_4_0
2828
] ++ (with gst_all_1; [
2929
# Audio & video support for webkitgtk WebView

pkgs/applications/networking/instant-messengers/dino/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
, vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext
44
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
55
, libadwaita
6-
, libnotify, libsoup, libgee
6+
, libnotify, libsoup_2_4, libgee
77
, libsignal-protocol-c
88
, libgcrypt
99
, sqlite
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
6262
libnotify
6363
gpgme
6464
libgcrypt
65-
libsoup
65+
libsoup_2_4
6666
pcre2
6767
icu
6868
libsignal-protocol-c
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
9090
"-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
9191
"-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
9292
"-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
93-
"-DSOUP_VERSION=${lib.versions.major libsoup.version}"
93+
"-DSOUP_VERSION=${lib.versions.major libsoup_2_4.version}"
9494
];
9595

9696
# Undefined symbols for architecture arm64: "_gpg_strerror"

pkgs/applications/networking/remote/citrix-workspace/generic.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more
22
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3
3-
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
3+
, heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
44
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
55
, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
66
, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
103103
libpng12
104104
libpulseaudio
105105
libsecret
106-
libsoup
106+
libsoup_2_4
107107
libvorbis
108108
libxml2
109109
llvmPackages_12.libunwind

pkgs/applications/office/grisbi/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
, libofx
77
, intltool
88
, wrapGAppsHook3
9-
, libsoup
9+
, libsoup_2_4
1010
, adwaita-icon-theme
1111
}:
1212

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
gtk
2525
libgsf
2626
libofx
27-
libsoup
27+
libsoup_2_4
2828
adwaita-icon-theme
2929
];
3030

pkgs/by-name/al/alcom/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
glib-networking,
99
google-fonts,
1010
lib,
11-
libsoup,
11+
libsoup_2_4,
1212
nodejs,
1313
npmHooks,
1414
openssl,
@@ -70,7 +70,7 @@ rustPlatform.buildRustPackage {
7070
[ openssl ]
7171
++ lib.optionals stdenv.hostPlatform.isLinux [
7272
glib-networking
73-
libsoup
73+
libsoup_2_4
7474
webkitgtk_4_0
7575
]
7676
++ dotnetSdk.packages

pkgs/by-name/an/ansel/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
, isocodes
4545
, libpsl
4646
, libepoxy
47-
, libsoup
47+
, libsoup_2_4
4848
, exiv2
4949
, libXtst
5050
, libthai
@@ -138,7 +138,7 @@ stdenv.mkDerivation {
138138
libsecret
139139
libselinux
140140
libsepol
141-
libsoup
141+
libsoup_2_4
142142
libsysprof-capture
143143
libthai
144144
libwebp

pkgs/by-name/ar/ario/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
, gettext
1111
, gtk3
1212
, libmpdclient
13-
, libsoup
13+
, libsoup_2_4
1414
, libxml2
1515
, taglib
1616
, wrapGAppsHook3
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939
dbus-glib
4040
gtk3
4141
libmpdclient
42-
libsoup
42+
libsoup_2_4
4343
libxml2
4444
taglib
4545
];

pkgs/by-name/aw/aws-workspaces/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
, webkitgtk_4_0
1515
, librsvg
1616
, gdk-pixbuf
17-
, libsoup
17+
, libsoup_2_4
1818
, glib-networking
1919
, graphicsmagick_q16
2020
, libva
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
5757
webkitgtk_4_0
5858
librsvg
5959
gdk-pixbuf
60-
libsoup
60+
libsoup_2_4
6161
glib-networking
6262
graphicsmagick_q16
6363
hiredis

pkgs/by-name/ca/cargo-tauri_1/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
cargo-tauri,
77
cargo-tauri_1,
88
gtk3,
9-
libsoup,
9+
libsoup_2_4,
1010
openssl,
1111
webkitgtk_4_0,
1212
}:
@@ -40,7 +40,7 @@ cargo-tauri.overrideAttrs (
4040
[ openssl ]
4141
++ lib.optionals stdenv.hostPlatform.isLinux [
4242
gtk3
43-
libsoup
43+
libsoup_2_4
4444
webkitgtk_4_0
4545
];
4646

pkgs/by-name/ca/catppuccinifier-gui/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
cairo,
99
stdenv,
1010
librsvg,
11-
libsoup,
11+
libsoup_2_4,
1212
fetchzip,
1313
openssl_3,
1414
webkitgtk_4_0,
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
4343
gtk3
4444
cairo
4545
gdk-pixbuf
46-
libsoup
46+
libsoup_2_4
4747
glib
4848
dbus
4949
openssl_3

pkgs/by-name/da/darktable/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ lib
22
, stdenv
33
, fetchurl
4-
, libsoup
4+
, libsoup_2_4
55
, graphicsmagick
66
, json-glib
77
, wrapGAppsHook3
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
8686
openexr_3
8787
sqlite
8888
libxslt
89-
libsoup
89+
libsoup_2_4
9090
graphicsmagick
9191
json-glib
9292
openjpeg

pkgs/by-name/de/desktop-postflop/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
, makeDesktopItem
77
, pkg-config
88
, gtk3
9-
, libsoup
9+
, libsoup_2_4
1010
, webkitgtk_4_0
1111
}:
1212

@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
5757

5858
buildInputs = [
5959
gtk3
60-
libsoup
60+
libsoup_2_4
6161
webkitgtk_4_0
6262
];
6363

pkgs/by-name/dl/dleyna-renderer/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
, gupnp
1212
, gupnp-av
1313
, gupnp-dlna
14-
, libsoup
14+
, libsoup_2_4
1515
, makeWrapper
1616
, docbook-xsl-nons
1717
, libxslt
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757
gupnp
5858
gupnp-av
5959
gupnp-dlna
60-
libsoup
60+
libsoup_2_4
6161
];
6262

6363
preFixup = ''

pkgs/by-name/dl/dleyna-server/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
, gupnp
1313
, gupnp-av
1414
, gupnp-dlna
15-
, libsoup
15+
, libsoup_2_4
1616
}:
1717

1818
stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
5151
gupnp
5252
gupnp-av
5353
gupnp-dlna
54-
libsoup
54+
libsoup_2_4
5555
];
5656

5757
preFixup = ''

pkgs/by-name/en/en-croissant/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
makeBinaryWrapper,
1313

1414
openssl,
15-
libsoup,
15+
libsoup_2_4,
1616
webkitgtk_4_0,
1717
gst_all_1,
1818
apple-sdk_11,
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
5959
buildInputs =
6060
lib.optionals stdenv.hostPlatform.isLinux [
6161
openssl
62-
libsoup
62+
libsoup_2_4
6363
webkitgtk_4_0
6464
gst_all_1.gstreamer
6565
gst_all_1.gst-plugins-base

pkgs/by-name/fo/fondo/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
, gtk3
1414
, libgee
1515
, libhandy
16-
, libsoup
16+
, libsoup_2_4
1717
, json-glib
1818
, glib-networking
1919
, desktop-file-utils
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949
json-glib
5050
libgee
5151
libhandy
52-
libsoup
52+
libsoup_2_4
5353
pantheon.granite
5454
];
5555

pkgs/by-name/ga/gamehub/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
, gtk3
1111
, glib-networking
1212
, libgee
13-
, libsoup
13+
, libsoup_2_4
1414
, json-glib
1515
, sqlite
1616
, webkitgtk_4_0
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
4646
json-glib
4747
libgee
4848
libmanette
49-
libsoup
49+
libsoup_2_4
5050
libXtst
5151
sqlite
5252
webkitgtk_4_0

pkgs/by-name/ge/geocode-glib/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
, docbook-xsl-nons
1111
, gobject-introspection
1212
, gnome
13-
, libsoup
13+
, libsoup_2_4
1414
, json-glib
1515
, glib
1616
, nixosTests
@@ -45,12 +45,12 @@ stdenv.mkDerivation rec {
4545

4646
buildInputs = [
4747
glib
48-
libsoup
48+
libsoup_2_4
4949
json-glib
5050
];
5151

5252
mesonFlags = [
53-
"-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}"
53+
"-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}"
5454
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
5555
];
5656

0 commit comments

Comments
 (0)