From bd77a41b4a66ba27562be44eb8280e2128d5204c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 13 Apr 2025 16:48:09 -0700
Subject: [PATCH 1/2] qutebrowser: 3.4.0 -> 3.5.0

Diff: https://github.com/qutebrowser/qutebrowser/compare/None...v3.5.0

Changelog: https://github.com/qutebrowser/qutebrowser/blob/v3.5.0/doc/changelog.asciidoc
---
 .../networking/browsers/qutebrowser/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 66a2fc921c56..9d187ff5c646 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -28,15 +28,15 @@ let
   isQt6 = lib.versions.major qtbase.version == "6";
   pdfjs =
     let
-      version = "4.2.67";
+      version = "5.1.91";
     in
     fetchzip {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-7kfT3+ZwoGqZ5OwkO9h3DIuBFd0v8fRlcufxoBdcy8c=";
+      hash = "sha256-e1zBpH9F8TI4ET4FvkxJsoOYVKLWJBP2KaNNC2kpaVk=";
       stripRoot = false;
     };
 
-  version = "3.4.0";
+  version = "3.5.0";
 in
 
 python3.pkgs.buildPythonApplication {
@@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-gUEkwO0zdDDmE6HaNm1eOJBMsgSa+xUFlxRWylymIj4=";
+    hash = "sha256-+hQsjRwoJbBotxs2BKiy1oLi7YShTD5ott54RDMdgLs=";
   };
 
   # Needs tox

From 0b261ba7f4ec432ca0869a36882bc1d631984774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 13 Apr 2025 17:14:53 -0700
Subject: [PATCH 2/2] qutebrowser: move to pkgs/by-name

---
 .../qu}/qutebrowser/fix-restart.patch          |  0
 .../qu/qutebrowser/package.nix}                | 17 +++++++----------
 pkgs/top-level/all-packages.nix                | 18 ++----------------
 3 files changed, 9 insertions(+), 26 deletions(-)
 rename pkgs/{applications/networking/browsers => by-name/qu}/qutebrowser/fix-restart.patch (100%)
 rename pkgs/{applications/networking/browsers/qutebrowser/default.nix => by-name/qu/qutebrowser/package.nix} (93%)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/by-name/qu/qutebrowser/fix-restart.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
rename to pkgs/by-name/qu/qutebrowser/fix-restart.patch
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/by-name/qu/qutebrowser/package.nix
similarity index 93%
rename from pkgs/applications/networking/browsers/qutebrowser/default.nix
rename to pkgs/by-name/qu/qutebrowser/package.nix
index 9d187ff5c646..21b7878cb75b 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -4,7 +4,6 @@
   fetchurl,
   fetchzip,
   python3,
-  wrapQtAppsHook,
   glib-networking,
   asciidoc,
   docbook_xml_dtd_45,
@@ -14,9 +13,7 @@
   withPdfReader ? true,
   pipewireSupport ? stdenv.hostPlatform.isLinux,
   pipewire,
-  qtwayland,
-  qtbase,
-  qtwebengine,
+  qt6Packages,
   enableWideVine ? false,
   widevine-cdm,
   # can cause issues on some graphics chips
@@ -25,7 +22,7 @@
 }:
 
 let
-  isQt6 = lib.versions.major qtbase.version == "6";
+  isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
   pdfjs =
     let
       version = "5.1.91";
@@ -54,11 +51,11 @@ python3.pkgs.buildPythonApplication {
 
   buildInputs =
     [
-      qtbase
+      qt6Packages.qtbase
       glib-networking
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
+      qt6Packages.qtwayland
     ];
 
   build-system = with python3.pkgs; [
@@ -66,7 +63,7 @@ python3.pkgs.buildPythonApplication {
   ];
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
     asciidoc
     docbook_xml_dtd_45
     docbook_xsl
@@ -148,7 +145,7 @@ python3.pkgs.buildPythonApplication {
           --set-default QSG_RHI_BACKEND vulkan
         ''}
         ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
-        --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources"
+        --set QTWEBENGINE_RESOURCES_PATH "${qt6Packages.qtwebengine}/resources"
       )
     '';
 
@@ -158,7 +155,7 @@ python3.pkgs.buildPythonApplication {
     description = "Keyboard-focused browser with a minimal GUI";
     license = licenses.gpl3Plus;
     mainProgram = "qutebrowser";
-    platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms;
+    platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms;
     maintainers = with maintainers; [
       jagajaga
       rnhmjoj
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 729df4dba04c..845078a77ded 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15969,22 +15969,8 @@ with pkgs;
     withXineBackend = true;
   };
 
-  qutebrowser = callPackage ../applications/networking/browsers/qutebrowser {
-    inherit (__splicedPackages.qt6Packages)
-      qtbase
-      qtwebengine
-      wrapQtAppsHook
-      qtwayland
-      ;
-  };
-
-  qutebrowser-qt5 = callPackage ../applications/networking/browsers/qutebrowser {
-    inherit (__splicedPackages.libsForQt5)
-      qtbase
-      qtwebengine
-      wrapQtAppsHook
-      qtwayland
-      ;
+  qutebrowser-qt5 = qutebrowser.override {
+    qt6Packages = libsForQt5;
   };
 
   rakarrack = callPackage ../applications/audio/rakarrack {