Commit a8b1837c authored by Jan Tojnar's avatar Jan Tojnar
Browse files

webkitgtk_4_0: drop

libsoup 2 is unmaintained so WebkitGTK decided to drop support for it in next release in March 2026:
https://discourse.gnome.org/t/webkitgtk-is-removing-support-for-libsoup-2/31873

Since the package is security critical, we backport all updates to stable.
Let’s remove it before branch-off to avoid breaking stable when that version is backported.
parent 899fd8a2
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@

- GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.

- `webkitgtk_4_0` has been removed because it depends on an unmaintained version of security-critical libsoup library (`libsoup_2`) and the support will be [dropped upstream soon](https://webkitgtk.org/2025/10/07/webkitgtk-soup2-deprecation.html).

- Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
  The latter was probably broken anyway.
  If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.
+2 −6
Original line number Diff line number Diff line
@@ -80,11 +80,7 @@
}:

let
  abiVersion =
    if lib.versionAtLeast gtk4.version "4.0" then
      "6.0"
    else
      "4.${if lib.versions.major libsoup_3.version == "2" then "0" else "1"}";
  abiVersion = if lib.versionAtLeast gtk4.version "4.0" then "6.0" else "4.1";
in

# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
@@ -225,7 +221,7 @@ clangStdenv.mkDerivation (finalAttrs: {
    [
      "-DENABLE_INTROSPECTION=ON"
      "-DPORT=GTK"
      "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup_3.version == "2")}"
      "-DUSE_SOUP2=${cmakeBool false}"
      "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
      "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
    ]
+1 −0
Original line number Diff line number Diff line
@@ -2755,6 +2755,7 @@ mapAliases {
  wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04
  webfontkitgenerator = webfont-bundler; # Added 2025-07-27
  webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11
  webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08
  webmetro = throw "'webmetro' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
  wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
  whatsapp-for-linux = wasistlos; # Added 2025-01-30
+0 −5
Original line number Diff line number Diff line
@@ -8819,11 +8819,6 @@ with pkgs;
    gtk4 = gtk3;
  };

  webkitgtk_4_0 = webkitgtk_6_0.override {
    libsoup_3 = libsoup_2_4;
    gtk4 = gtk3;
  };

  wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { };

  wt = wt4;
+0 −15
Original line number Diff line number Diff line
@@ -388,11 +388,6 @@
        "libjack2"
      ]
    },
    "javascriptcoregtk-4.0": {
      "attrPath": [
        "webkitgtk_4_0"
      ]
    },
    "lapack": {
      "attrPath": [
        "liblapack"
@@ -820,16 +815,6 @@
        "isDarwin": false
      }
    },
    "webkit2gtk-4.0": {
      "attrPath": [
        "webkitgtk_4_0"
      ]
    },
    "webkit2gtk-web-extension-4.0": {
      "attrPath": [
        "webkitgtk_4_0"
      ]
    },
    "x11": {
      "attrPath": [
        "xorg",