libchamplain: remove libsoup 2.4 variant (#525672)

This commit is contained in:
Jan Tojnar
2026-05-30 16:43:40 +00:00
committed by GitHub
5 changed files with 8 additions and 11 deletions
+2 -2
View File
@@ -9,7 +9,7 @@
vala,
pkg-config,
adwaita-icon-theme,
libchamplain,
libchamplain_libsoup3,
gdl,
wrapGAppsHook3,
}:
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gdl
libchamplain
libchamplain_libsoup3
adwaita-icon-theme
libxml2
];
@@ -15,10 +15,8 @@
sqlite,
gnome,
clutter-gtk,
libsoup_2_4,
libsoup_3,
gobject-introspection, # , libmemphis
withLibsoup3 ? false,
}:
stdenv.mkDerivation rec {
@@ -51,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
sqlite
(if withLibsoup3 then libsoup_3 else libsoup_2_4)
libsoup_3
];
propagatedBuildInputs = [
@@ -64,7 +62,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
(lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform))
"-Dvapi=true"
(lib.mesonBool "libsoup3" withLibsoup3)
(lib.mesonBool "libsoup3" true)
];
passthru = {
@@ -89,7 +87,7 @@ stdenv.mkDerivation rec {
OpenCycleMap, OpenAerialMap, and Maps for free.
'';
teams = lib.optionals withLibsoup3 [
teams = [
lib.teams.gnome
lib.teams.pantheon
];
+2 -2
View File
@@ -8,7 +8,7 @@
wrapGAppsHook4,
enchant,
gtkmm4,
libchamplain,
libchamplain_libsoup3,
libgcrypt,
shared-mime-info,
libshumate,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
libgcrypt
enchant
gtkmm4
(libchamplain.override { withLibsoup3 = true; })
libchamplain_libsoup3
libshumate
];
+1
View File
@@ -1110,6 +1110,7 @@ mapAliases {
libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27
libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27
libcef = throw "'libcef' has been removed, as no packages depend on it"; # Added 2025-11-06
libchamplain = throw "'libchamplain' has been removed due to reliance on insecure libsoup 2.4. Consider using 'libchamplain_libsoup3' instead"; # Added 2026-05-29
libdbiDrivers = warnAlias "'libdbiDrivers' has been renamed to 'libdbi-drivers'" libdbi-drivers; # Added 2026-02-08
libdbiDriversBase = warnAlias "'libdbiDriversBase' has been renamed to 'libdbi-drivers-base'" libdbi-drivers-base; # Added 2026-02-08
libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
-2
View File
@@ -6391,8 +6391,6 @@ with pkgs;
else
pkgs.libcanberra-gtk2;
libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; };
libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { };
libdbi-drivers-base = libdbi-drivers.override {