From 0867229ede13d22fe0ad37182ee92289f155aa33 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 14 Jan 2026 23:37:55 +0100 Subject: [PATCH] qutebrowser-qt5: drop --- pkgs/by-name/qu/qutebrowser/package.nix | 7 +++---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index bfa0fbb44de5..e6359a874a72 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -24,7 +24,6 @@ }: let - isQt6 = lib.versions.major qt6Packages.qtbase.version == "6"; pdfjs = let version = "5.4.394"; @@ -39,7 +38,7 @@ let in python3.pkgs.buildPythonApplication { - pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5"; + pname = "qutebrowser"; inherit version; pyproject = true; @@ -76,7 +75,7 @@ python3.pkgs.buildPythonApplication { dependencies = with python3.pkgs; [ colorama pyyaml - (if isQt6 then pyqt6-webengine else pyqtwebengine) + pyqt6-webengine jinja2 pygments # scripts and userscripts libs @@ -138,7 +137,7 @@ python3.pkgs.buildPythonApplication { let libPath = lib.makeLibraryPath [ pipewire ]; resourcesPath = - if (isQt6 && stdenv.hostPlatform.isDarwin) then + if stdenv.hostPlatform.isDarwin then "${qt6Packages.qtwebengine}/lib/QtWebEngineCore.framework/Resources" else "${qt6Packages.qtwebengine}/resources"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 70cfdeb0ebca..9ef4c2371091 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1546,6 +1546,7 @@ mapAliases { quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18 quictls = throw "'quictls' has been removed. QUIC support is now available in `openssl`."; quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07 + qutebrowser-qt5 = lib.warnOnInstantiate "'qutebrowser-qt5' has been removed as it depended on vulnerable and outdated qt5 webengine" qutebrowser; # Added 2026-01-14 qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03 ra-multiplex = lib.warnOnInstantiate "'ra-multiplex' has been renamed to/replaced by 'lspmux'" lspmux; # Added 2025-10-27 radiance = throw "'radiance' has been removed as it was broken for a long time"; # Added 2026-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a985cf429e7..70e1ac7232a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10970,10 +10970,6 @@ with pkgs; withXineBackend = true; }; - qutebrowser-qt5 = qutebrowser.override { - qt6Packages = libsForQt5; - }; - rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk_1_3; };