From a5689a2ff1bf6449d709c6fbf6ed0c5b3bfea8b3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 31 Dec 2019 16:00:51 +0100 Subject: matrix-synapse: 1.7.2 -> 1.7.3 https://github.com/matrix-org/synapse/releases/tag/v1.7.3 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c270caa5a8e5..577915be134b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.7.2"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1nhzjmxzv5bvihl58cdpjw3hdghbh2pz7sg437k841mjn1qqq5lx"; + sha256 = "1vpwf6jqwb66mq31lk5f0wzfsqa2l65rd7b1zqjbhvmz0js8kz5f"; }; patches = [ -- cgit 1.4.1 From c1878442146983573dc547d3a7c1da99fc958fe0 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Jan 2020 00:24:48 +0000 Subject: unit: add withRuby_2_7 option --- pkgs/servers/http/unit/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 8711be4b5c00..71ccbb2c15a3 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -9,6 +9,7 @@ , withRuby_2_4 ? false, ruby_2_4 , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 +, withRuby_2_7 ? true, ruby_2_7 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { ++ optional withRuby_2_4 ruby_2_4 ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 + ++ optional withRuby_2_7 ruby_2_7 ++ optional withSSL openssl; configureFlags = [ @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"} ${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"} ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"} + ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ''; meta = { -- cgit 1.4.1 From 96f4563f1e6eb7f773c50f413afdbea737355db9 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 1 Jan 2020 18:00:02 +0200 Subject: freeswitch: fix gsmopen build and enable by default for linux --- pkgs/servers/sip/freeswitch/default.nix | 37 +++++++++++++++------------------ pkgs/servers/sip/freeswitch/modules.nix | 4 +++- 2 files changed, 20 insertions(+), 21 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index a55d1cf14cda..5f066adccccd 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,5 +1,19 @@ +{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline +, openssl, perl, sqlite, libjpeg, speex, pcre +, ldns, libedit, yasm, which, lua, libopus, libsndfile, libtiff +, libctb, gsmlib + +, modules ? null +, postgresql +, enablePostgres ? true + +, SystemConfiguration +}: + let +availableModules = import ./modules.nix { inherit curl lua libopus libctb gsmlib; }; + # the default list from v1.8.7, except with applications/mod_signalwire also disabled defaultModules = mods: with mods; [ applications.commands @@ -57,26 +71,9 @@ defaultModules = mods: with mods; [ xml_int.cdr xml_int.rpc xml_int.scgi -]; - -in - -{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline -, openssl, perl, sqlite, libjpeg, speex, pcre -, ldns, libedit, yasm, which, lua, libopus, libsndfile, libtiff - -, modules ? defaultModules -, postgresql -, enablePostgres ? true - -, SystemConfiguration -}: - -let - -availableModules = import ./modules.nix { inherit curl lua libopus; }; +] ++ lib.optionals stdenv.isLinux [ endpoints.gsmopen ]; -enabledModules = modules availableModules; +enabledModules = (if modules != null then modules else defaultModules) availableModules; modulesConf = let lst = builtins.map (mod: mod.path) enabledModules; @@ -127,7 +124,7 @@ stdenv.mkDerivation rec { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = https://freeswitch.org/; license = stdenv.lib.licenses.mpl11; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ misuzu ]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix index aed30e467e8b..2d8f541a3c29 100644 --- a/pkgs/servers/sip/freeswitch/modules.nix +++ b/pkgs/servers/sip/freeswitch/modules.nix @@ -1,4 +1,6 @@ { libopus +, libctb +, gsmlib , lua , curl }: @@ -114,7 +116,7 @@ in endpoints = { alsa = mk "endpoints/mod_alsa" []; dingaling = mk "endpoints/mod_dingaling" []; - gsmopen = mk "endpoints/mod_gsmopen" []; + gsmopen = mk "endpoints/mod_gsmopen" [ gsmlib libctb ]; h323 = mk "endpoints/mod_h323" []; khomp = mk "endpoints/mod_khomp" []; loopback = mk "endpoints/mod_loopback" []; -- cgit 1.4.1 From 6d66795575e6e6dcdc7bc5fa15dae789a918e0b6 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 1 Jan 2020 23:07:45 +0200 Subject: freeswitch: 1.8.7 -> 1.10.2 --- pkgs/servers/sip/freeswitch/default.nix | 37 +++++++++++++++++++-------------- pkgs/servers/sip/freeswitch/modules.nix | 7 +++++++ 2 files changed, 28 insertions(+), 16 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 5f066adccccd..aeedf8b30aee 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,18 +1,20 @@ -{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline +{ fetchFromGitHub, stdenv, lib, pkgconfig, autoreconfHook +, ncurses, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre -, ldns, libedit, yasm, which, lua, libopus, libsndfile, libtiff -, libctb, gsmlib +, ldns, libedit, yasm, which, libsndfile, libtiff -, modules ? null -, postgresql -, enablePostgres ? true +, curl, lua, libmysqlclient, postgresql, libopus, libctb, gsmlib , SystemConfiguration + +, modules ? null }: let -availableModules = import ./modules.nix { inherit curl lua libopus libctb gsmlib; }; +availableModules = import ./modules.nix { + inherit curl lua libmysqlclient postgresql libopus libctb gsmlib; +}; # the default list from v1.8.7, except with applications/mod_signalwire also disabled defaultModules = mods: with mods; [ @@ -41,6 +43,9 @@ defaultModules = mods: with mods; [ codecs.h26x codecs.opus + databases.mariadb + databases.pgsql + dialplans.asterisk dialplans.xml @@ -83,11 +88,13 @@ modulesConf = let in stdenv.mkDerivation rec { - name = "freeswitch-1.8.7"; - - src = fetchurl { - url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "0k52mxdfc5w9fdnz8kvfjiwnnjjhnpkirnyrfkhq7bad84m731z4"; + pname = "freeswitch"; + version = "1.10.2"; + src = fetchFromGitHub { + owner = "signalwire"; + repo = pname; + rev = "v${version}"; + sha256 = "1fmrm51zgrasjbmhs0pzb1lyca3ddx0wd35shvxnkjnifi8qd1h7"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl @@ -95,23 +102,21 @@ stdenv.mkDerivation rec { --replace AS=\''${AS} AS=yasm ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl ncurses gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which libsndfile libtiff ] ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules) - ++ lib.optionals enablePostgres [ postgresql ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; NIX_CFLAGS_COMPILE = "-Wno-error"; hardeningDisable = [ "format" ]; - configureFlags = lib.optionals enablePostgres [ "--enable-core-pgsql-support" ]; - preConfigure = '' + ./bootstrap.sh cp "${modulesConf}" modules.conf ''; diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix index 2d8f541a3c29..be80fe56dda6 100644 --- a/pkgs/servers/sip/freeswitch/modules.nix +++ b/pkgs/servers/sip/freeswitch/modules.nix @@ -3,6 +3,8 @@ , gsmlib , lua , curl +, libmysqlclient +, postgresql }: let @@ -103,6 +105,11 @@ in theora = mk "codecs/mod_theora" []; }; + databases = { + mariadb = mk "databases/mod_mariadb" [ libmysqlclient ]; + pgsql = mk "databases/mod_pgsql" [ postgresql ]; + }; + dialplans = { asterisk = mk "dialplans/mod_dialplan_asterisk" []; directory = mk "dialplans/mod_dialplan_directory" []; -- cgit 1.4.1 From 0e31950cb41167553e74b98de8ba8c32b11c2449 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 2 Jan 2020 21:25:10 +0100 Subject: gotify-server: 2.0.12 -> 2.0.13 https://github.com/gotify/server/releases/tag/v2.0.13 --- pkgs/servers/gotify/default.nix | 4 ++-- pkgs/servers/gotify/ui.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 3d644093a0bb..9782b2890550 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "gotify-server"; # Note that when this is updated, along with the hash, the `ui.nix` file # should include the same changes to the version and the sha256. - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0pkws83ymmlxcdxadb1w6rmibw84vzhx9xrhxc6b1rjncb80l0kk"; + sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; }; modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv"; diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index ecb0367e3f22..2c1bddec68f6 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.12"; + version = "2.0.13"; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0pkws83ymmlxcdxadb1w6rmibw84vzhx9xrhxc6b1rjncb80l0kk"; + sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; }; src = "${src_all}/ui"; -- cgit 1.4.1