Merge remote-tracking branch 'origin/master' into staging-next

nixos/modules/services/networking/tftpd.nix

@@ -1,15 +1,14 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-
-  ###### 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,30 +16,23 @@ 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.
       '';
     };
-
   };
 
-
-  ###### implementation
-
-  config = mkIf config.services.tftpd.enable {
-
+  config = lib.mkIf config.services.tftpd.enable {
     services.xinetd.enable = true;
 
-    services.xinetd.services = 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}";
+    };
   };
-
 }

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 ];

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"

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 = [ "." ];
 

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;
+  };
+}