From 4c62c92dc3bea96dd14798ce06bf0f952c01df7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Sat, 29 Mar 2025 02:17:48 +0700 Subject: [PATCH] =?UTF-8?q?ejabberd:=2024.12=20=E2=86=92=2025.03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ej/ejabberd/package.nix | 24 ++++-------- pkgs/by-name/ej/ejabberd/rebar-deps.nix | 52 ++++++++++++------------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index de16727c3bf6..6e6e0668064b 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -53,21 +53,21 @@ let provider_asn1 = buildRebar3 { name = "provider_asn1"; - version = "0.3.0"; + version = "0.4.1"; src = fetchHex { pkg = "provider_asn1"; - version = "0.3.0"; - sha256 = "sha256-MuelWYZi01rBut8jM6a5alMZizPGZoBE/LveSRu/+wU="; + version = "0.4.1"; + sha256 = "sha256-HqR6IyJyJinvbPJJlhJE14yEiBbNmTGOmR0hqonrOR0="; }; beamDeps = [ ]; }; rebar3_hex = buildRebar3 { name = "rebar3_hex"; - version = "7.0.7"; + version = "7.0.8"; src = fetchHex { pkg = "rebar3_hex"; - version = "7.0.7"; - sha256 = "sha256-1S2igSwiInATUgULZ1E6e2dK6YI5gvRffHRfF1Gg5Ok="; + version = "7.0.8"; + sha256 = "sha256-aEY0EEZwRHp6AAuE1pSfm5RjBjU+PaaJuKp7fvXRiBc="; }; beamDeps = [ ]; }; @@ -141,7 +141,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "24.12"; + version = "25.03"; nativeBuildInputs = [ makeWrapper @@ -170,17 +170,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE="; + hash = "sha256-VEH1V8v2wQ9qf6Xcj00xHw30tWo0s9AhPyoB7d5B8k8="; }; - patches = [ - # Fix json_encode_with_kv_list used in mod_matrix_gw - (fetchpatch2 { - url = "https://github.com/processone/ejabberd/commit/056635119c8b9f169f1c59cccbf81faab88a6712.patch?full_index=1"; - hash = "sha256-53NMT/SwPtaeo8zaJ1JHW6HUZrxkITi731UOdsFAlJ4="; - }) - ]; - passthru.tests = { inherit (nixosTests) ejabberd; }; diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index 4fd3e6740b74..bd5b79474028 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -44,21 +44,21 @@ let }; yconf = builder { name = "yconf"; - version = "1.0.17"; + version = "1.0.18"; src = fetchHex { pkg = "yconf"; - version = "1.0.17"; - sha256 = "sha256-3SiSkjJBRJpGzIRXuewPsUAwcAc1pYhZVWd8c1w0GiU="; + version = "1.0.18"; + sha256 = "sha256-+pUOxlA/ktZBf7jMHZgkA/BBaX6OG79NRYj7kZuVYuo="; }; beamDeps = [ fast_yaml ]; }; xmpp = builder { name = "xmpp"; - version = "1.9.1"; + version = "1.10.0"; src = fetchHex { pkg = "xmpp"; - version = "1.9.1"; - sha256 = "sha256-0rFDGvbkwaTIv5DK8MwRzesEe4MjuH6dfkgm1JEyddw="; + version = "1.10.0"; + sha256 = "sha256-zurkO4/pdknY+FRrP38rOOz8kxwM3Vx0Rf+z+A/LfYU="; }; beamDeps = [ ezlib @@ -71,11 +71,11 @@ let }; stun = builder { name = "stun"; - version = "1.2.15"; + version = "1.2.17"; src = fetchHex { pkg = "stun"; - version = "1.2.15"; - sha256 = "sha256-9tilQaKf0T8s5li2dsDMZhJiuW4EW1Le8WRLdevA7e8="; + version = "1.2.17"; + sha256 = "sha256-azGCRMIehSSpquOsmgXNgjTumUwcLIFd5o0wYIatdo0="; }; beamDeps = [ fast_tls @@ -84,11 +84,11 @@ let }; stringprep = builder { name = "stringprep"; - version = "1.0.30"; + version = "1.0.31"; src = fetchHex { pkg = "stringprep"; - version = "1.0.30"; - sha256 = "sha256-9vybM4SgOHeDD4my84WAyvP0onRIpKMz1qjDl1wiC5o="; + version = "1.0.31"; + sha256 = "sha256-6WmciOjbFrOkHw5FrGh0pNqBpuSFSnfXbt5tCbCONTA="; }; beamDeps = [ p1_utils ]; }; @@ -117,18 +117,18 @@ let version = "1.0.26"; src = fetchHex { pkg = "p1_utils"; - version = "1.0.26"; - sha256 = "sha256-0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw="; + version = "1.0.27"; + sha256 = "sha256-8a+UKwpivPoNWfvjBnm+T/614kGgxJ7V8JTbL1uA9eA="; }; beamDeps = [ ]; }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.29"; + version = "1.1.32"; src = fetchHex { pkg = "p1_pgsql"; - version = "1.1.29"; - sha256 = "sha256-pv9Y6LF0mT84ldo+piEan50MVNGm4ouzIdo7PNaLOME="; + version = "1.1.32"; + sha256 = "sha256-JosB6PTrdcIRoxSVolwoFcVJrszi8N8aFhxuCizeBh4="; }; beamDeps = [ xmpp ]; }; @@ -144,11 +144,11 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "1.0.25"; + version = "1.0.26"; src = fetchHex { pkg = "p1_mysql"; - version = "1.0.25"; - sha256 = "sha256-5hh/+ulbcmCY6I8+5vI0SsJZziwm4O5AOwX+7zQa5DQ="; + version = "1.0.26"; + sha256 = "sha256-6hOAg/LFRxm5z1Sdv1gCooiwAZ6j5USbNUx0zAP6/ew="; }; beamDeps = [ ]; }; @@ -250,11 +250,11 @@ let }; esip = builder { name = "esip"; - version = "1.0.56"; + version = "1.0.57"; src = fetchHex { pkg = "esip"; - version = "1.0.56"; - sha256 = "sha256-nvNmDO+TtiP3No3NXHn05wQ1hjGQnm3UZOM1N4gV2h8="; + version = "1.0.57"; + sha256 = "sha256-GcNX4YF7HgR5LvNZv5AEAPPm0OWt6Sn9cviOqbRK8u0="; }; beamDeps = [ fast_tls @@ -284,11 +284,11 @@ let }; eimp = builder { name = "eimp"; - version = "1.0.23"; + version = "1.0.24"; src = fetchHex { pkg = "eimp"; - version = "1.0.23"; - sha256 = "sha256-kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo="; + version = "1.0.24"; + sha256 = "sha256-fWFDLrikVlnAvkdfROde62UXQ6pkod6K33hc2tgZYa0="; }; beamDeps = [ p1_utils ]; };