ejabberd: 17.07 -> 18.01
This commit is contained in:
parent
9a3d7eab70
commit
8502d51a48
|
@ -1,5 +1,6 @@
|
||||||
{ stdenv, writeScriptBin, lib, fetchurl, git, cacert
|
{ stdenv, writeScriptBin, lib, fetchurl, git, cacert
|
||||||
, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps
|
, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd
|
||||||
|
, flock
|
||||||
, withMysql ? false
|
, withMysql ? false
|
||||||
, withPgsql ? false
|
, withPgsql ? false
|
||||||
, withSqlite ? false, sqlite
|
, withSqlite ? false, sqlite
|
||||||
|
@ -23,17 +24,17 @@ let
|
||||||
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
|
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
version = "17.07";
|
version = "18.01";
|
||||||
name = "ejabberd-${version}";
|
name = "ejabberd-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
|
url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
|
||||||
sha256 = "1p8ppp2czjgnq8xnhyksd82npvvx99fwr0g3rrq1wvnwh2vgb8km";
|
sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ fakegit ];
|
nativeBuildInputs = [ fakegit ];
|
||||||
|
|
||||||
buildInputs = [ erlang openssl expat libyaml ]
|
buildInputs = [ erlang openssl expat libyaml gd ]
|
||||||
++ lib.optional withSqlite sqlite
|
++ lib.optional withSqlite sqlite
|
||||||
++ lib.optional withPam pam
|
++ lib.optional withPam pam
|
||||||
++ lib.optional withZlib zlib
|
++ lib.optional withZlib zlib
|
||||||
|
@ -50,7 +51,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
|
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
|
||||||
|
|
||||||
buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
|
nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
|
||||||
|
|
||||||
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||||
|
|
||||||
|
@ -74,7 +75,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHashAlgo = "sha256";
|
outputHashAlgo = "sha256";
|
||||||
outputHash = "1q9yzccn4zf5i4hibq1r0i34q4986a93ph4792l1ph07aiisc8p7";
|
outputHash = "1v3h0c7kfifb6wsfxyv5j1wc7rlxbb7r0pgd4s340wiyxnllzzhk";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
|
@ -92,6 +93,10 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./ejabberdctl.patch
|
||||||
|
];
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
cp -r $deps deps
|
cp -r $deps deps
|
||||||
chmod -R +w deps
|
chmod -R +w deps
|
||||||
|
@ -101,18 +106,18 @@ in stdenv.mkDerivation rec {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
sed -i \
|
sed -i \
|
||||||
-e '2iexport PATH=${ctlpath}:$PATH' \
|
-e '2iexport PATH=${ctlpath}:$PATH' \
|
||||||
-e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \
|
-e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \
|
||||||
-e 's,\(^ *JOT=\).*,\1,' \
|
-e 's,\(^ *JOT=\).*,\1,' \
|
||||||
-e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
|
-e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
|
||||||
$out/sbin/ejabberdctl
|
$out/sbin/ejabberdctl
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "Open-source XMPP application server written in Erlang";
|
description = "Open-source XMPP application server written in Erlang";
|
||||||
license = lib.licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
homepage = http://www.ejabberd.im;
|
homepage = http://www.ejabberd.im;
|
||||||
platforms = lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ lib.maintainers.sander lib.maintainers.abbradar ];
|
maintainers = with maintainers; [ sander abbradar ];
|
||||||
broken = withElixir;
|
broken = withElixir;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
32
krebs/5pkgs/simple/ejabberd/ejabberdctl.patch
Normal file
32
krebs/5pkgs/simple/ejabberd/ejabberdctl.patch
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
--- a/ejabberdctl.template 1970-01-01 01:00:01.000000000 +0100
|
||||||
|
+++ b/ejabberdctl.template 2018-04-24 23:06:54.127715441 +0200
|
||||||
|
@@ -42,19 +42,18 @@
|
||||||
|
esac
|
||||||
|
|
||||||
|
# parse command line parameters
|
||||||
|
-for arg; do
|
||||||
|
- case $arg in
|
||||||
|
- -n|--node) ERLANG_NODE_ARG=$2; shift;;
|
||||||
|
- -s|--spool) SPOOL_DIR=$2; shift;;
|
||||||
|
- -l|--logs) LOGS_DIR=$2; shift;;
|
||||||
|
- -f|--config) EJABBERD_CONFIG_PATH=$2; shift;;
|
||||||
|
- -c|--ctl-config) EJABBERDCTL_CONFIG_PATH=$2; shift;;
|
||||||
|
- -d|--config-dir) ETC_DIR=$2; shift;;
|
||||||
|
- -t|--no-timeout) NO_TIMEOUT="--no-timeout";;
|
||||||
|
- --) :;;
|
||||||
|
+while test $# -gt 0; do
|
||||||
|
+ case $1 in
|
||||||
|
+ -n|--node) ERLANG_NODE_ARG=$2; shift 2;;
|
||||||
|
+ -s|--spool) SPOOL_DIR=$2; shift 2;;
|
||||||
|
+ -l|--logs) LOGS_DIR=$2; shift 2;;
|
||||||
|
+ -f|--config) EJABBERD_CONFIG_PATH=$2; shift 2;;
|
||||||
|
+ -c|--ctl-config) EJABBERDCTL_CONFIG_PATH=$2; shift 2;;
|
||||||
|
+ -d|--config-dir) ETC_DIR=$2; shift 2;;
|
||||||
|
+ -t|--no-timeout) NO_TIMEOUT="--no-timeout"; shift 1;;
|
||||||
|
+ # --) :;; what is this for?
|
||||||
|
*) break;;
|
||||||
|
esac
|
||||||
|
- shift
|
||||||
|
done
|
||||||
|
|
||||||
|
# define ejabberd variables if not already defined from the command line
|
Loading…
Reference in New Issue
Block a user