From ab9d32678470cd853e91ba92a2bbed6d165a25ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 22:05:57 +0000 Subject: [PATCH 1/5] 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 a415c1c20d847a76c61305c731cfb1ff8786b430 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 4 Jul 2026 09:08:39 +0200 Subject: [PATCH 2/5] python313Packages.ttfautohint-py: remove outdated dependency to fix build pkg_resources was removed from the ttfautohint-py source code. It started causing dependency conflicts because python3Packages.fs depends on setuptools 80. --- pkgs/development/python-modules/ttfautohint-py/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix index 69c0b33a9eb4..adcf961c5745 100644 --- a/pkgs/development/python-modules/ttfautohint-py/default.nix +++ b/pkgs/development/python-modules/ttfautohint-py/default.nix @@ -36,10 +36,6 @@ buildPythonPackage rec { distutils ]; - dependencies = [ - setuptools # for pkg_resources - ]; - buildInputs = [ ttfautohint ]; nativeCheckInputs = [ From e0ac37b915947389138a4d8a63398d69361f850a Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 4 Jul 2026 09:08:39 +0200 Subject: [PATCH 3/5] python313Packages.gftools: remove outdated dependency to fix build pkg_resources was removed from the source code. It started causing dependency conflicts because python3Packages.fs depends on setuptools 80. --- pkgs/development/python-modules/gftools/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix index 8bbc95076833..72bbfd772b87 100644 --- a/pkgs/development/python-modules/gftools/default.nix +++ b/pkgs/development/python-modules/gftools/default.nix @@ -158,7 +158,6 @@ buildPythonPackage rec { requests rich ruamel-yaml - setuptools skia-pathops statmake strictyaml From 2278d8e20e1d47c8d2a92037731abb8a792b5f58 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 4 Jul 2026 09:08:39 +0200 Subject: [PATCH 4/5] jetbrains-mono: use python 3.13 gftools to fix build 'fs' is unsupported on Python 3.14 which breaks 'gftools' on 3.14. --- pkgs/by-name/je/jetbrains-mono/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jetbrains-mono/package.nix b/pkgs/by-name/je/jetbrains-mono/package.nix index 4461ab2bafef..5584347e5a2b 100644 --- a/pkgs/by-name/je/jetbrains-mono/package.nix +++ b/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 = '' From b76bf041c7e5465b47654ddf015235e8fcadc184 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 5 Jul 2026 01:13:47 -0400 Subject: [PATCH 5/5] 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