diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-07-01 08:12:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-01 08:12:37 +0100 |
commit | 9b24799b112c57c356a3681e6ed857b024402e4a (patch) | |
tree | a055596a661521885dec19d9041bd7ebac450681 /pkgs/servers/xmpp | |
parent | f75e2a648c76976c8b2d5e9e147a1eaa0a84f3d8 (diff) | |
parent | 6a04b91a9873d4bc9b2d91c5231ada97475efe2b (diff) |
Merge pull request #122569 from Izorkin/update-ejabberd
ejabberd: 20.12 -> 21.04
Diffstat (limited to 'pkgs/servers/xmpp')
-rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 69b55a6f3c29b..bf0b7472c5712 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -6,8 +6,6 @@ , withSqlite ? false, sqlite , withPam ? false, pam , withZlib ? true, zlib -, withRiak ? false -, withElixir ? false, elixir , withIconv ? true , withTools ? false , withRedis ? false @@ -24,12 +22,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ]; in stdenv.mkDerivation rec { - version = "20.12"; + version = "21.04"; pname = "ejabberd"; src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz"; - sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; + sha256 = "09s8mj0dkvp9mxazsqxqqmnl5n2xyi8avx0rzgvqrbl3byanzfzr"; }; nativeBuildInputs = [ fakegit makeWrapper ]; @@ -38,11 +36,7 @@ in stdenv.mkDerivation rec { ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib - ++ lib.optional withElixir elixir - ; - - # Apparently needed for Elixir - LANG = "en_US.UTF-8"; + ; deps = stdenv.mkDerivation { pname = "ejabberd-deps"; @@ -52,7 +46,7 @@ in stdenv.mkDerivation rec { 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"; @@ -76,7 +70,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY="; + outputHash = "1mvixgb46ss35abjwz3lw38c69bii1xyj557a92bvrxc1gc6gx31"; }; configureFlags = @@ -85,8 +79,6 @@ in stdenv.mkDerivation rec { (lib.enableFeature withSqlite "sqlite") (lib.enableFeature withPam "pam") (lib.enableFeature withZlib "zlib") - (lib.enableFeature withRiak "riak") - (lib.enableFeature withElixir "elixir") (lib.enableFeature withIconv "iconv") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") @@ -97,7 +89,7 @@ in stdenv.mkDerivation rec { preBuild = '' cp -r $deps deps chmod -R +w deps - patchShebangs deps + patchShebangs . ''; postInstall = '' @@ -108,6 +100,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl 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; { @@ -116,6 +109,5 @@ in stdenv.mkDerivation rec { homepage = "https://www.ejabberd.im"; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ]; - broken = withElixir; }; } |