flake: Update overlay to contain all our packages

Add snipe-it and chrysalis-bin (for x86_64-linux) to overlay.  Those
somehow slipped through.

default.nix

@@ -6,14 +6,12 @@ let
 
 in rec {
 
-  janus-gateway = callPackage ./pkgs/janus-gateway { inherit usrsctp; };
+  janus-gateway = callPackage ./pkgs/janus-gateway { };
 
   nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { };
 
   snipe-it = callPackage ./pkgs/snipe-it { };
 
-  usrsctp = callPackage ./pkgs/usrsctp { };
-
 } // optionalAttrs (pkgs.system == "x86_64-linux") {
 
   chrysalis-bin = callPackage ./pkgs/chrysalis-bin { };

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1615583000,
+        "lastModified": 1628427351,
-        "narHash": "sha256-ysd3ntUs8qeVuYdmp2Y5J992NVdoKji9i92StU3IJ7M=",
+        "narHash": "sha256-WuZUIQ07AvRw+T9wvQ3qFf8MXmKZ+ktZz9drNgWXDbs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "60b18a066e8ce5dd21ebff5324345d3586a67ad9",
+        "rev": "348bc5de8bca09c624f5c4975f538684da4713d2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-20.09-small",
+        "ref": "nixos-21.05-small",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "meterriblecrew.net package flake";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09-small";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05-small";
 
   outputs = inputs@{ self, nixpkgs }: let
 
@@ -33,10 +33,11 @@
         inherit (localPkgs)
           janus-gateway
           nextcloud-spreed-signaling
-          usrsctp
+          snipe-it
           ;
       } // prev.lib.optionalAttrs (prev.system == "x86_64-linux") {
         inherit (localPkgs)
+          chrysalis-bin
           ryzenadj
           ryzen_smu
           ;

pkgs/janus-gateway/default.nix

@@ -1,32 +1,18 @@
-{ stdenv, lib, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt
-, jansson
+, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv
-, libconfig
+, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus
-, libnice
+, usrsctp, ffmpeg
-, openssl
-, srtp
-, usrsctp
-, libmicrohttpd
-, libwebsockets
-, gnumake
-#, cmake
-, rabbitmq-c
-#, paho-mqtt-c
-, nanomsg
-, curl
-, sofia_sip
-, libopus
-, libogg
-, lua
-, glib
-, zlib
-, pkgconfig
-, gengetopt
-, autoconf
-, automake
-, libtool
-, libuv
 }:
 
+let
+  libwebsockets_janus = libwebsockets.overrideAttrs (_: {
+    configureFlags = [
+      "-DLWS_MAX_SMP=1"
+      "-DLWS_WITHOUT_EXTENSIONS=0"
+    ];
+  });
+in
+
 stdenv.mkDerivation rec {
   pname = "janus-gateway";
   version = "0.11.3";
@@ -35,47 +21,39 @@ stdenv.mkDerivation rec {
     owner = "meetecho";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-/x0oo29zsnmyKw3QGXbnhMmgQJ9AefQ5cUTwY/5typY=";
+    sha256 = "15nadpz67w24f4wz8ya0kx0a1jc4wxv1kl0d5fr7kckkdyijh7gz";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
-    jansson
-    libconfig
-    libnice
-    openssl
-    srtp
-    usrsctp
-    libmicrohttpd
-    libwebsockets
-    gnumake
-    #cmake
-    rabbitmq-c
-    #paho-mqtt-c
-    nanomsg
-    curl
-    sofia_sip
-    libopus
-    libogg
-    lua
-    glib
-    zlib
-    pkgconfig
-    gengetopt
-    libuv
 
-    autoconf
+  buildInputs = [
-    automake
+    glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd
-    libtool
+    curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg
   ];
 
   enableParallelBuilding = true;
 
-  preConfigure = "./autogen.sh";
+  configureFlags = [
+    "--enable-boringssl=${boringssl}"
+    "--enable-libsrtp2"
+    "--enable-turn-rest-api"
+    "--enable-json-logger"
+    "--enable-gelf-event-handler"
+    "--enable-post-processing"
+  ];
+
+  outputs = [ "out" "dev" "doc" "man" ];
+
+  postInstall = ''
+    moveToOutput share/janus "$doc"
+    moveToOutput etc "$doc"
+  '';
 
   meta = with lib; {
-    description = "Janus WebRTC server";
+    description = "General purpose WebRTC server";
-    homepage = src.meta.homepage;
+    homepage = "https://janus.conf.meetecho.com/";
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ aw ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz ];
   };
 }

pkgs/nextcloud-spreed-signaling/default.nix

@@ -2,21 +2,21 @@
 
 buildGoPackage rec {
   pname = "nextcloud-spreed-signaling";
-  version = "0.2.0";
+  version = "0.3.0";
 
   goPackagePath = "github.com/strukturag/nextcloud-spreed-signaling";
 
   subPackages = [
-    "src/signaling"
+    "client"
-    "src/server"
+    "server"
-    "src/proxy"
+    "proxy"
   ];
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-heDi/kWyPDZ9oPjBhNRBAkiKkkEnXmfSanYvCUSB5Ls=";
+    sha256 = "sha256-oKH9rpZa+CGnqgQD6Wa1KPi26ePrGZJzz9WXOauNs+U=";
   };
 
   nativeBuildInputs = [ easyjson ];
@@ -24,8 +24,7 @@ buildGoPackage rec {
   goDeps = ./deps.nix;
 
   preBuild = ''
-    ln -s $PWD/go/src/${goPackagePath}/src/* go/src
+    easyjson -all go/src/github.com/strukturag/nextcloud-spreed-signaling/{api_signaling,api_backend,api_proxy,natsclient,room}.go
-    easyjson -all go/src/signaling/{api_signaling,api_backend,api_proxy,natsclient,room}.go
   '';
 
   meta = with lib; {

pkgs/usrsctp/default.nix

@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, which, libtool, autoconf, automake }:
-
-stdenv.mkDerivation rec {
-  pname = "usrsctp";
-  version = "0.9.5.0";
-
-  src = fetchFromGitHub {
-    owner = "sctplab";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-Sengtkg4UoA03cPy5+dRSr5qKIttWHEKn48udOP8zYI=";
-  };
-
-  nativeBuildInputs = [ which libtool autoconf automake ];
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-O2";
-
-  preConfigure = "./bootstrap";
-
-  meta = with lib; {
-    description = "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows";
-    homepage = src.meta.homepage;
-    maintainers = with maintainers; [ aw ];
-    license = licenses.bsd3;
-  };
-}