From 7e6a0edf647b2054b1e198f0921d91446b86f77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Nov 2024 15:49:59 +0100 Subject: [PATCH 1/7] nixos/tftpd: remove with lib --- nixos/modules/services/networking/tftpd.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix index c9c0a2b321d5..d8fe87ad8d78 100644 --- a/nixos/modules/services/networking/tftpd.nix +++ b/nixos/modules/services/networking/tftpd.nix @@ -1,15 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - { ###### interface options = { - services.tftpd.enable = mkOption { - type = types.bool; + services.tftpd.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable tftpd, a Trivial File Transfer Protocol server. @@ -17,8 +15,8 @@ with lib; ''; }; - services.tftpd.path = mkOption { - type = types.path; + services.tftpd.path = lib.mkOption { + type = lib.types.path; default = "/srv/tftp"; description = '' Where the tftp server files are stored. @@ -30,11 +28,11 @@ with lib; ###### implementation - config = mkIf config.services.tftpd.enable { + config = lib.mkIf config.services.tftpd.enable { services.xinetd.enable = true; - services.xinetd.services = singleton + services.xinetd.services = lib.singleton { name = "tftp"; protocol = "udp"; server = "${pkgs.netkittftp}/sbin/in.tftpd"; From 8440f6cc6f825d2ca85585f6fbcf3018d934f7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Nov 2024 15:54:39 +0100 Subject: [PATCH 2/7] nixos/tftpd: format with nixmft-rfc-style --- nixos/modules/services/networking/tftpd.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix index d8fe87ad8d78..17ced3547d22 100644 --- a/nixos/modules/services/networking/tftpd.nix +++ b/nixos/modules/services/networking/tftpd.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { @@ -25,19 +30,18 @@ }; - ###### implementation config = lib.mkIf config.services.tftpd.enable { services.xinetd.enable = true; - services.xinetd.services = lib.singleton - { name = "tftp"; - protocol = "udp"; - server = "${pkgs.netkittftp}/sbin/in.tftpd"; - serverArgs = "${config.services.tftpd.path}"; - }; + services.xinetd.services = lib.singleton { + name = "tftp"; + protocol = "udp"; + server = "${pkgs.netkittftp}/sbin/in.tftpd"; + serverArgs = "${config.services.tftpd.path}"; + }; }; From 22fea14d1197342935c1e95aee2e1886092f2e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Nov 2024 15:55:13 +0100 Subject: [PATCH 3/7] nixos/tftpd: cleanup --- nixos/modules/services/networking/tftpd.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nixos/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix index 17ced3547d22..40fcf22611e9 100644 --- a/nixos/modules/services/networking/tftpd.nix +++ b/nixos/modules/services/networking/tftpd.nix @@ -6,11 +6,7 @@ }: { - - ###### interface - options = { - services.tftpd.enable = lib.mkOption { type = lib.types.bool; default = false; @@ -27,13 +23,9 @@ Where the tftp server files are stored. ''; }; - }; - ###### implementation - config = lib.mkIf config.services.tftpd.enable { - services.xinetd.enable = true; services.xinetd.services = lib.singleton { @@ -42,7 +34,5 @@ server = "${pkgs.netkittftp}/sbin/in.tftpd"; serverArgs = "${config.services.tftpd.path}"; }; - }; - } From 7895f51712a131d2928957e4e4fe742c855903bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 07:43:35 +0000 Subject: [PATCH 4/7] kyverno-chainsaw: 0.2.11 -> 0.2.12 --- pkgs/by-name/ky/kyverno-chainsaw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index 9dcfbeaf5787..7ab72bcd1d9d 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-s66TG4r3WSmEfcJzibu8uKv1Pr0aKfTEFNfJzLHjbIA="; + hash = "sha256-BxSJu71/KhVtWEOw2V+nteZnvyyoGvrbWQmHGqDtLa0="; }; - vendorHash = "sha256-NQJbj1lFR5947Lrw5nSsdfYlkWjTWJ5ybMq7Bpd/s3I="; + vendorHash = "sha256-zB2HkY8ryPWln0HcKZPMCSKUnbCh/2UivteN6danNJU="; subPackages = [ "." ]; From b51e7b6d2e19ad42667d80e9ee72ab0fda59c956 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 10:00:31 +0000 Subject: [PATCH 5/7] cilium-cli: 0.16.21 -> 0.16.22 --- pkgs/by-name/ci/cilium-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index 9fc516fba885..f7e09b0fae4d 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.21"; + version = "0.16.22"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-CduyQeUIh+FK1yS/3uLjBKDWkVF5f6FSlRG9+A+EI/I="; + hash = "sha256-P4S+4N9f/m28lNwx7xzYcq99nvXelSvzX01QXDhfGM4="; }; nativeBuildInputs = [ installShellFiles ]; From 7f7d07b78cc1dd27d49b9ac7eede03305c505649 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 13:23:15 +0000 Subject: [PATCH 6/7] kluctl: 2.25.1 -> 2.26.0 --- pkgs/by-name/kl/kluctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kl/kluctl/package.nix b/pkgs/by-name/kl/kluctl/package.nix index 0787375d74f3..743672a9a276 100644 --- a/pkgs/by-name/kl/kluctl/package.nix +++ b/pkgs/by-name/kl/kluctl/package.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "kluctl"; - version = "2.25.1"; + version = "2.26.0"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-EfzMDOIp/dfnpLTnaUkZ1sfGVtQqUgeGyHNiWIwSxQ4="; + hash = "sha256-qtntImc+fiRPMUHVM4A8d2e17zklV47CJ10M9A8oa7k="; }; subPackages = [ "cmd" ]; - vendorHash = "sha256-iE4fPRq2kalP53AO3YaaqbRMH4Cl6XB5UseJmepoW+4="; + vendorHash = "sha256-89VEYX8xBdV36hHNIaRP8JoXTEGXmgzL7iL/Y4+1mzA="; ldflags = [ "-s" From 48266dec13f03c4e4b62ec5a0a3fe0619f043ae7 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 18 Dec 2024 19:33:30 +0100 Subject: [PATCH 7/7] v4l2-to-ndi: init at 0-unstable-2022-09-14 (#279586) * v4l2-to-ndi: init at 0-unstable-2022-09-14 * Update pkgs/by-name/v4/v4l2-to-ndi/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/by-name/v4/v4l2-to-ndi/package.nix | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/v4/v4l2-to-ndi/package.nix diff --git a/pkgs/by-name/v4/v4l2-to-ndi/package.nix b/pkgs/by-name/v4/v4l2-to-ndi/package.nix new file mode 100644 index 000000000000..4912c362692b --- /dev/null +++ b/pkgs/by-name/v4/v4l2-to-ndi/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoPatchelfHook, + openssl, + curl, + avahi, + ndi, +}: + +stdenv.mkDerivation { + pname = "v4l2-to-ndi"; + version = "0-unstable-2022-09-14"; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + openssl + curl + avahi + ndi + ]; + + src = fetchFromGitHub { + owner = "lplassman"; + repo = "V4L2-to-NDI"; + rev = "4dd5e9594acc4f154658283ee52718fa58018ac9"; + hash = "sha256-blB8HRfO2k1zsZamugOXZzW8uS26uf8+7sA0zBbV/K4="; + }; + + buildPhase = '' + runHook preBuild + mkdir build + g++ -std=c++14 -pthread -Wl,--allow-shlib-undefined -Wl,--as-needed \ + -I'NDI SDK for Linux'/include/ \ + -Iinclude/ \ + -L'NDI SDK for Linux'/lib/x86_64-linux-gnu \ + -o build/v4l2ndi main.cpp PixelFormatConverter.cpp -lndi -ldl + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r build $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Video input (V4L2) to NDI converter"; + homepage = "https://github.com/lplassman/V4L2-to-NDI"; + license = licenses.mit; + maintainers = with maintainers; [ + pinpox + MayNiklas + ]; + mainProgram = "v4l2ndi"; + platforms = platforms.linux; + }; +}