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 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 = '' 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 = [ 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 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 = [