Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 16 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix
index 7ea64aa3f134..1c15455b6add 100644
--- a/nixpkgs/pkgs/development/libraries/ndi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix
@@ -1,15 +1,19 @@
-{ lib, stdenv, requireFile, avahi }:
+{ lib, stdenv, requireFile, avahi, obs-studio-plugins }:
 
+let
+  versionJSON = lib.importJSON ./version.json;
+in
 stdenv.mkDerivation rec {
   pname = "ndi";
-  fullVersion = "4.6.2";
-  version = builtins.head (builtins.splitVersion fullVersion);
+  version = versionJSON.version;
+  majorVersion = builtins.head (builtins.splitVersion version);
+  installerName = "Install_NDI_SDK_v${majorVersion}_Linux";
 
   src = requireFile rec {
-    name    = "InstallNDISDK_v${version}_Linux.tar.gz";
-    sha256  = "181ypfj1bl0kljzrfr6037i14ykg2y4plkzdhym6m3z7kcrnm1fl";
+    name    = "${installerName}.tar.gz";
+    sha256  = versionJSON.hash;
     message = ''
-      In order to use NDI SDK version ${fullVersion}, you need to comply with
+      In order to use NDI SDK version ${version}, you need to comply with
       NewTek's license and download the appropriate Linux tarball from:
 
         ${meta.homepage}
@@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
 
   unpackPhase = ''
     unpackFile ${src}
-    echo y | ./InstallNDISDK_v4_Linux.sh
+    echo y | ./${installerName}.sh
     sourceRoot="NDI SDK for Linux";
   '';
 
@@ -51,6 +55,11 @@ stdenv.mkDerivation rec {
   # Stripping breaks ndi-record.
   dontStrip = true;
 
+  passthru.tests = {
+    inherit (obs-studio-plugins) obs-ndi;
+  };
+  passthru.updateScript = ./update.py;
+
   meta = with lib; {
     homepage = "https://ndi.tv/sdk/";
     description = "NDI Software Developer Kit";