Compare commits

..

5 Commits

Author SHA1 Message Date
Andreas Wiese 1c6b646175 flake: Update overlay to contain all our packages
Add snipe-it and chrysalis-bin (for x86_64-linux) to overlay.  Those
somehow slipped through.
2021-08-09 00:22:47 +02:00
Andreas Wiese 1037ad9afd janus-gateway: use nixpkgs-unstable's derivation
This is in nixpkgs-unstable now, thus can be dropped once 21.11 (?) is
released.  For now, drop our own derivation in favour of what's coming.
2021-08-09 00:20:42 +02:00
Andreas Wiese 11d2b31e42 usrsctp: remove
This is in nixpkgs now.
2021-08-09 00:10:24 +02:00
Andreas Wiese d79195ebf3 flake: move inputs.nixpkgs to nixos-21.05-small
Flake input changes:

* Updated 'nixpkgs': 'github:NixOS/nixpkgs/60b18a066e8ce5dd21ebff5324345d3586a67ad9' -> 'github:NixOS/nixpkgs/348bc5de8bca09c624f5c4975f538684da4713d2'
2021-08-09 00:05:58 +02:00
Andreas Wiese f227ab33ff nextcloud-spreed-signaling: 0.2.0 -> 0.3.0 2021-08-08 23:11:11 +02:00
7 changed files with 1113 additions and 139 deletions

View File

@ -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 { };

View File

@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1615583000,
"narHash": "sha256-ysd3ntUs8qeVuYdmp2Y5J992NVdoKji9i92StU3IJ7M=",
"lastModified": 1628427351,
"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"
}

View File

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

View File

@ -1,32 +1,18 @@
{ stdenv, lib, fetchFromGitHub
, 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
, autoconf
, automake
, libtool
, libuv
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt
, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv
, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus
, usrsctp, ffmpeg
}:
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 = [
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
nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
autoconf
automake
libtool
buildInputs = [
glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd
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";
homepage = src.meta.homepage;
license = licenses.gpl3;
maintainers = with maintainers; [ aw ];
description = "General purpose WebRTC server";
homepage = "https://janus.conf.meetecho.com/";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ];
};
}

View File

@ -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"
"src/server"
"src/proxy"
"client"
"server"
"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/signaling/{api_signaling,api_backend,api_proxy,natsclient,room}.go
easyjson -all go/src/github.com/strukturag/nextcloud-spreed-signaling/{api_signaling,api_backend,api_proxy,natsclient,room}.go
'';
meta = with lib; {

File diff suppressed because it is too large Load Diff

View File

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