b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #122569 from Izorkin/update-ejabberd

Browse source 
ejabberd: 20.12 -> 21.04
This commit is contained in:
Jörg Thalheim 2021-07-01 08:12:37 +01:00 committed by GitHub
parent f75e2a648c 6a04b91a98
commit 9b24799b11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/servers/xmpp/ejabberd/default.nix
View file

@ -6,8 +6,6 @@
, withSqlite ? false, sqlite , withSqlite ? false, sqlite
, withPam ? false, pam , withPam ? false, pam
, withZlib ? true, zlib , withZlib ? true, zlib
, withRiak ? false
, withElixir ? false, elixir
, withIconv ? true , withIconv ? true
, withTools ? false , withTools ? false
, withRedis ? false , withRedis ? false
@ -24,12 +22,12 @@ let
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ]; ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "20.12"; version = "21.04";
pname = "ejabberd"; pname = "ejabberd";
src = fetchurl { src = fetchurl {
url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz"; url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz";
sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; sha256 = "09s8mj0dkvp9mxazsqxqqmnl5n2xyi8avx0rzgvqrbl3byanzfzr";
}; };
nativeBuildInputs = [ fakegit makeWrapper ]; nativeBuildInputs = [ fakegit makeWrapper ];
@ -38,11 +36,7 @@ in stdenv.mkDerivation rec {
++ lib.optional withSqlite sqlite ++ lib.optional withSqlite sqlite
++ lib.optional withPam pam ++ lib.optional withPam pam
++ lib.optional withZlib zlib ++ lib.optional withZlib zlib
++ lib.optional withElixir elixir ;
;
# Apparently needed for Elixir
LANG = "en_US.UTF-8";
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
pname = "ejabberd-deps"; pname = "ejabberd-deps";
@ -52,7 +46,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ]; nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib ];
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
@ -76,7 +70,7 @@ in stdenv.mkDerivation rec {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY="; outputHash = "1mvixgb46ss35abjwz3lw38c69bii1xyj557a92bvrxc1gc6gx31";
}; };
configureFlags = configureFlags =
@ -85,8 +79,6 @@ in stdenv.mkDerivation rec {
(lib.enableFeature withSqlite "sqlite") (lib.enableFeature withSqlite "sqlite")
(lib.enableFeature withPam "pam") (lib.enableFeature withPam "pam")
(lib.enableFeature withZlib "zlib") (lib.enableFeature withZlib "zlib")
(lib.enableFeature withRiak "riak")
(lib.enableFeature withElixir "elixir")
(lib.enableFeature withIconv "iconv") (lib.enableFeature withIconv "iconv")
(lib.enableFeature withTools "tools") (lib.enableFeature withTools "tools")
(lib.enableFeature withRedis "redis") (lib.enableFeature withRedis "redis")
@ -97,7 +89,7 @@ in stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
cp -r $deps deps cp -r $deps deps
chmod -R +w deps chmod -R +w deps
patchShebangs deps patchShebangs .
''; '';
postInstall = '' postInstall = ''
@ -108,6 +100,7 @@ in stdenv.mkDerivation rec {
-e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
$out/sbin/ejabberdctl $out/sbin/ejabberdctl
wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}"
rm $out/bin/{mix,iex,elixir}
''; '';
meta = with lib; { meta = with lib; {
@ -116,6 +109,5 @@ in stdenv.mkDerivation rec {
homepage = "https://www.ejabberd.im"; homepage = "https://www.ejabberd.im";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ sander abbradar ]; maintainers = with maintainers; [ sander abbradar ];
broken = withElixir;
}; };
} }