Merge staging-next into staging

nixos/modules/programs/immersed.nix

@@ -26,7 +26,7 @@ in
     programs.immersed = {
       enable = lib.mkEnableOption "immersed";
 
-      openPorts = lib.mkOption {
+      openFirewall = lib.mkOption {
         type = lib.types.bool;
         default = false;
         description = "Whether to open firewall ports for Immersed";
@@ -51,7 +51,7 @@ in
     environment.systemPackages = [ cfg.package ];
 
     # https://immersed.helpscoutdocs.com/article/23-connection-troubleshooting-linux
-    networking.firewall = lib.mkIf cfg.openPorts {
+    networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts = [ 21000 ];
       allowedUDPPorts = [
         21000

pkgs/by-name/je/jetbrains-mono/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  python3Packages,
+  python313Packages,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -19,7 +19,8 @@ stdenvNoCC.mkDerivation rec {
   env."PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION" = "python";
 
   nativeBuildInputs = [
-    python3Packages.gftools
+    # Currently broken on 3.14
+    python313Packages.gftools
   ];
 
   buildPhase = ''

pkgs/by-name/sh/shotcut/package.nix

@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shotcut";
-  version = "26.4.30";
+  version = "26.6.25";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qDW7d0pWYd8ZofXKCEfXl4/XQ9tfEjhJf8avf4tM0q8=";
+    hash = "sha256-iFaN3WB0CYdENXM4XLoi2RxCOG7kHmvfLRItvxCKYLA=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/gftools/default.nix

@@ -158,7 +158,6 @@ buildPythonPackage rec {
     requests
     rich
     ruamel-yaml
-    setuptools
     skia-pathops
     statmake
     strictyaml

pkgs/development/python-modules/ttfautohint-py/default.nix

@@ -36,10 +36,6 @@ buildPythonPackage rec {
     distutils
   ];
 
-  dependencies = [
-    setuptools # for pkg_resources
-  ];
-
   buildInputs = [ ttfautohint ];
 
   nativeCheckInputs = [