c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2026-07-05 07:07:10 +00:00 • committed by GitHub
commit c47bf7192a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/programs/immersed.nix
View file

@ -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

4
pkgs/by-name/sh/shotcut/package.nix
View file

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