diff --git a/pkgs/by-name/gp/gpx-viewer/package.nix b/pkgs/by-name/gp/gpx-viewer/package.nix index 4323b4e91ab5..a9e745ccd49e 100644 --- a/pkgs/by-name/gp/gpx-viewer/package.nix +++ b/pkgs/by-name/gp/gpx-viewer/package.nix @@ -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 ]; diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain_libsoup3/package.nix similarity index 91% rename from pkgs/by-name/li/libchamplain/package.nix rename to pkgs/by-name/li/libchamplain_libsoup3/package.nix index 547aa3902c56..0f1449b98c9a 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain_libsoup3/package.nix @@ -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 ]; diff --git a/pkgs/by-name/li/lifeograph/package.nix b/pkgs/by-name/li/lifeograph/package.nix index 2e0d441dd900..5542cc8815ce 100644 --- a/pkgs/by-name/li/lifeograph/package.nix +++ b/pkgs/by-name/li/lifeograph/package.nix @@ -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 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6a58d3ed03b2..45ac3ca16a9c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3096b138f82e..77ff703bb4a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {