From ab9d32678470cd853e91ba92a2bbed6d165a25ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 22:05:57 +0000
Subject: [PATCH 1/2] shotcut: 26.4.30 -> 26.6.25

---
 pkgs/by-name/sh/shotcut/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix
index 9c6d5d96d8e9..43f5886217cf 100644
--- a/pkgs/by-name/sh/shotcut/package.nix
+++ b/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 = [

From b76bf041c7e5465b47654ddf015235e8fcadc184 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sun, 5 Jul 2026 01:13:47 -0400
Subject: [PATCH 2/2] nixos/immersed: openPorts -> openFirewall

The PR that added this is only a few hours old (https://github.com/NixOS/nixpkgs/pull/399766) and hasn't had the chance to enter an unstable released, which is why I haven't added a rename flag.
---
 nixos/modules/programs/immersed.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/immersed.nix b/nixos/modules/programs/immersed.nix
index 53c984c74c9f..7c7b8d13592d 100644
--- a/nixos/modules/programs/immersed.nix
+++ b/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