Merge staging-next into staging

maintainers/maintainer-list.nix

···
     githubId = 7558482;
     name = "Jack Gerrits";
   };
+  jackr = {
+    name = "Jack Rosenberg";
+    email = "[e-mail]";
+    github = "jackrosenberg";
+    githubId = 56937175;
+  };
   jacobkoziej = {
     name = "Jacob Koziej";
     email = "[e-mail]";

pkgs/by-name/fo/fosrl-gerbil/package.nix

···
+{
+  lib,
+  iptables,
+  fetchFromGitHub,
+  buildGoModule,
+  replaceVars,
+}:
+
+buildGoModule rec {
+  pname = "fosrl-gerbil";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "fosrl";
+    repo = "gerbil";
+    tag = version;
+    hash = "sha256-6ZmnokXmn4KIfNZT9HrraYP4fjfY2C0sK+xAJyq/pkU=";
+  };
+  # patch out the /usr/sbin/iptables
+  postPatch = ''
+    substituteInPlace main.go \
+      --replace-fail '/usr/sbin/iptables' '${lib.getExe iptables}'
+  '';
+
+  vendorHash = "sha256-lYJjw+V94oxILu+akUnzGACtsU7CLGwljysRvyUk+yA=";
+
+  meta = {
+    description = "Simple WireGuard interface management server";
+    mainProgram = "gerbil";
+    homepage = "https://github.com/fosrl/gerbil";
+    changelog = "https://github.com/fosrl/gerbil/releases/tag/${version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ jackr ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/qu/qutebrowser/package.nix

···
   isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
   pdfjs =
     let
-      version = "5.1.91";
+      version = "5.3.31";
     in
     fetchzip {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-e1zBpH9F8TI4ET4FvkxJsoOYVKLWJBP2KaNNC2kpaVk=";
+      hash = "sha256-8QNFCIRSaF0y98P1mmx0u+Uf0/Zd7nYlFGXp9SkURTc=";
       stripRoot = false;
     };
 
-  version = "3.5.0";
+  version = "3.5.1";
 in
 
 python3.pkgs.buildPythonApplication {
···
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-+hQsjRwoJbBotxs2BKiy1oLi7YShTD5ott54RDMdgLs=";
+    hash = "sha256-gmu6MooINXJI1eWob6qwpzZVSXQ5rVTSaeISBVkms44=";
   };
 
   # Needs tox

pkgs/os-specific/linux/kernel/kernels-org.json

···
 {
     "testing": {
-        "version": "6.15-rc7",
-        "hash": "sha256:0b9149pyg4lzzxqwx6sg8nz9ca1md7aijg9nrcagrq9sypl53hxn"
+        "version": "6.16-rc1",
+        "hash": "sha256:0wi66d2wma4lfs3pbwqg7k1pavxc3wyr54yxii3mmaab81pfdx27"
     },
     "6.1": {
         "version": "6.1.141",
···
         "hash": "sha256:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
     },
     "6.12": {
-        "version": "6.12.32",
-        "hash": "sha256:0w3a6k0cbdanknlha3qjyvvmhh3xks9d6xq1043laf3q2xr21c59"
+        "version": "6.12.33",
+        "hash": "sha256:0m52a9mnwc919fsyiyn1gafnrr2mz7w8s7v4n05s40r61xipb9f0"
     },
     "6.13": {
         "version": "6.13.12",
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.10",
-        "hash": "sha256:0hzylab1gh791qpi5albv5wcjz0m7hrs4k7f6bw24k77xb7rg2yy"
+        "version": "6.14.11",
+        "hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
     },
     "6.15": {
-        "version": "6.15.1",
-        "hash": "sha256:0r0dkxwhp4qrihfvbk4ppvyciin1iv9qbp76w2ppnbjizs2bpwa4"
+        "version": "6.15.2",
+        "hash": "sha256:0n28a43nv94vvdkllw5gky9dznymk4myf1jlphfid3jhdimcsn1l"
     }
 }