Skip to content

Commit c5f7d8c

Browse files
niklaskorzniklaskorz
authored
ejabberd: 26.02 → 26.04 (#504293)
2 parents 3bcfffa + f059562 commit c5f7d8c

2 files changed

Lines changed: 75 additions & 88 deletions

File tree

‎pkgs/by-name/ej/ejabberd/package.nix‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
gawk,
2020
fetchFromGitHub,
2121
fetchgit,
22+
fetchNpmDeps,
2223
beamPackages,
2324
nixosTests,
2425
withMysql ? false,
@@ -35,6 +36,9 @@
3536
withRedis ? false,
3637
withImagemagick ? false,
3738
imagemagick,
39+
withBootstrap ? true, # used for the built-in mod_invites page
40+
nodejs,
41+
npmHooks,
3842
}:
3943

4044
let
@@ -76,7 +80,6 @@ let
7680
builder = lib.makeOverridable buildRebar3;
7781

7882
overrides = final: prev: {
79-
jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; };
8083
cache_tab = prev.cache_tab.override { buildPlugins = [ beamPackages.pc ]; };
8184
mqtree = prev.mqtree.override { buildPlugins = [ beamPackages.pc ]; };
8285
stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; };
@@ -137,10 +140,11 @@ let
137140
"ezlib"
138141
];
139142

143+
npmToolingUsed = withBootstrap;
140144
in
141145
stdenv.mkDerivation (finalAttrs: {
142146
pname = "ejabberd";
143-
version = "26.02";
147+
version = "26.04";
144148

145149
nativeBuildInputs = [
146150
makeWrapper
@@ -151,6 +155,10 @@ stdenv.mkDerivation (finalAttrs: {
151155
rebar3_hex
152156
];
153157
})
158+
]
159+
++ lib.optionals npmToolingUsed [
160+
nodejs
161+
npmHooks.npmConfigHook
154162
];
155163

156164
buildInputs = [
@@ -166,11 +174,17 @@ stdenv.mkDerivation (finalAttrs: {
166174
++ lib.optional withLua allBeamDeps.luerl
167175
++ lib.optional withRedis allBeamDeps.eredis;
168176

177+
npmDeps = lib.optionalDrvAttr npmToolingUsed (fetchNpmDeps {
178+
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
179+
src = finalAttrs.src;
180+
hash = "sha256-MTyoc8ozrCi3W0CXmxyLpyU8v+vlUjcbLnv/1ev/Qqo=";
181+
});
182+
169183
src = fetchFromGitHub {
170184
owner = "processone";
171185
repo = "ejabberd";
172186
tag = finalAttrs.version;
173-
hash = "sha256-izP7Rz65Lr4LDOCzZPdDWb3TyXDSTd/8gOPSfovVGM8=";
187+
hash = "sha256-PF65TgHvKeSEudEqqJVEotu2zgiWgGtRuNvbiyE0nwc=";
174188
};
175189

176190
passthru.tests = {
@@ -187,6 +201,7 @@ stdenv.mkDerivation (finalAttrs: {
187201
(lib.enableFeature withLua "lua")
188202
(lib.enableFeature withTools "tools")
189203
(lib.enableFeature withRedis "redis")
204+
(lib.enableFeature withBootstrap "bootstrap")
190205
]
191206
++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
192207

@@ -199,6 +214,10 @@ stdenv.mkDerivation (finalAttrs: {
199214
touch _build/default/lib/.built
200215
'';
201216

217+
preBuild = lib.optionalString npmToolingUsed /* sh */ ''
218+
npm run postinstall
219+
'';
220+
202221
env.REBAR_IGNORE_DEPS = 1;
203222

204223
postInstall = ''

‎pkgs/by-name/ej/ejabberd/rebar-deps.nix‎

Lines changed: 53 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,23 @@ in
1212
let
1313
self = packages // (overrides self packages);
1414
packages = with self; {
15-
unicode_util_compat = builder {
16-
name = "unicode_util_compat";
17-
version = "0.7.1";
18-
src = fetchHex {
19-
pkg = "unicode_util_compat";
20-
version = "0.7.1";
21-
sha256 = "sha256-s6kXhUzjriM2GXRK0eAQLgVnMTZ3b7L6diNPPgOyNkI=";
22-
};
23-
beamDeps = [ ];
24-
};
25-
jiffy = builder {
26-
name = "jiffy";
27-
version = "1.1.2";
28-
src = fetchHex {
29-
pkg = "jiffy";
30-
version = "1.1.2";
31-
sha256 = "sha256-u2G8Qqcgu9M8sJpBDki7eaYQEsdMuLPnXybZiEhc84E=";
32-
};
33-
beamDeps = [ ];
34-
};
35-
base64url = builder {
36-
name = "base64url";
37-
version = "1.0.1";
38-
src = fetchHex {
39-
pkg = "base64url";
40-
version = "1.0.1";
41-
sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w=";
42-
};
43-
beamDeps = [ ];
44-
};
4515
yconf = builder {
4616
name = "yconf";
47-
version = "1.0.22";
17+
version = "1.0.23";
4818
src = fetchHex {
4919
pkg = "yconf";
50-
version = "1.0.22";
51-
sha256 = "sha256-rKg0V86r5wdWSEtch7p7GVX1EdSZFoaH6uqnwwDoV/E=";
20+
version = "1.0.23";
21+
sha256 = "sha256-JbTft1MoAmrKp3TPXG+4fUi1XuvOYw3aozYkQdrDFDc=";
5222
};
5323
beamDeps = [ fast_yaml ];
5424
};
5525
xmpp = builder {
5626
name = "xmpp";
57-
version = "1.12.0";
27+
version = "1.13.3";
5828
src = fetchHex {
5929
pkg = "xmpp";
60-
version = "1.12.0";
61-
sha256 = "sha256-AUuuc2WfuiVncesAe8U0hhiscn3R0QuasVqf74cWIsg=";
30+
version = "1.13.3";
31+
sha256 = "sha256-BWSKpNvM/uYqqnlLKSowWEY50DyR9cCGa+jDQ0tqb0g=";
6232
};
6333
beamDeps = [
6434
ezlib
@@ -71,11 +41,11 @@ let
7141
};
7242
stun = builder {
7343
name = "stun";
74-
version = "1.2.21";
44+
version = "1.2.22";
7545
src = fetchHex {
7646
pkg = "stun";
77-
version = "1.2.21";
78-
sha256 = "sha256-PX/o77nQWyQKaqmmv4uLe/8tgCiV0XBEPFiJh9weEtk=";
47+
version = "1.2.22";
48+
sha256 = "sha256-NAi0sR1SN6CI9TsmCgaUDDCxb0pICUiS1qkgThZDGIo=";
7949
};
8050
beamDeps = [
8151
fast_tls
@@ -84,11 +54,11 @@ let
8454
};
8555
stringprep = builder {
8656
name = "stringprep";
87-
version = "1.0.33";
57+
version = "1.0.34";
8858
src = fetchHex {
8959
pkg = "stringprep";
90-
version = "1.0.33";
91-
sha256 = "sha256-lvizC8UIh/YFsztGvKHSSMGah5MZuMSCeQ47TaXamMA=";
60+
version = "1.0.34";
61+
sha256 = "sha256-J+eOo3GIF2TgVvvoRdOtMEdA/14xMbwfOKZvC6qMm0c=";
9262
};
9363
beamDeps = [ p1_utils ];
9464
};
@@ -114,23 +84,23 @@ let
11484
};
11585
p1_utils = builder {
11686
name = "p1_utils";
117-
version = "1.0.28";
87+
version = "1.0.29";
11888
src = fetchHex {
11989
pkg = "p1_utils";
120-
version = "1.0.28";
121-
sha256 = "sha256-xJvUS8SkCtmWaRr4Jt1+CqVtTQzXMIFxkKH4TRp/ADM=";
90+
version = "1.0.29";
91+
sha256 = "sha256-IHFCHK21uP/xFOkdTZRPFIUcMyOR9uk/xQEarWSr4bk=";
12292
};
12393
beamDeps = [ ];
12494
};
12595
p1_pgsql = builder {
12696
name = "p1_pgsql";
127-
version = "1.1.38";
97+
version = "1.1.41";
12898
src = fetchHex {
12999
pkg = "p1_pgsql";
130-
version = "1.1.38";
131-
sha256 = "sha256-Bs9kQwCBeOujh7ou6STTYgBBuuTaGyyWloAoSgXMdZ4=";
100+
version = "1.1.41";
101+
sha256 = "sha256-Ju4quj1FBGTt1LP/nassalP8ILv9Mwppc5grkGUEoXI=";
132102
};
133-
beamDeps = [ xmpp ];
103+
beamDeps = [ stringprep ];
134104
};
135105
p1_oauth2 = builder {
136106
name = "p1_oauth2";
@@ -144,37 +114,35 @@ let
144114
};
145115
p1_mysql = builder {
146116
name = "p1_mysql";
147-
version = "1.0.27";
117+
version = "1.0.28";
148118
src = fetchHex {
149119
pkg = "p1_mysql";
150-
version = "1.0.27";
151-
sha256 = "sha256-BmBR8kACenZzJUfmnZagl05w3BTe2UU77yYyIYQe2ps=";
120+
version = "1.0.28";
121+
sha256 = "sha256-bk0A6OzlBbpQkcjas67+QVzy2Db/OVCDRMNSezZtmRk=";
152122
};
153123
beamDeps = [ ];
154124
};
155125
p1_acme = builder {
156126
name = "p1_acme";
157-
version = "1.0.30";
127+
version = "1.0.31";
158128
src = fetchHex {
159129
pkg = "p1_acme";
160-
version = "1.0.30";
161-
sha256 = "sha256-KTXiCRa4BtOxFmlTpNkKaQ/YB4EJYUD+XKH2XVnr1oo=";
130+
version = "1.0.31";
131+
sha256 = "sha256-m1kiqQq5TaWInmTeXMrTrcbmim08P7cI3VA3V7Iy2xw=";
162132
};
163133
beamDeps = [
164-
base64url
165134
idna
166-
jiffy
167135
jose
168136
yconf
169137
];
170138
};
171139
mqtree = builder {
172140
name = "mqtree";
173-
version = "1.0.19";
141+
version = "1.0.20";
174142
src = fetchHex {
175143
pkg = "mqtree";
176-
version = "1.0.19";
177-
sha256 = "sha256-yBBlcVxJoYgoEvgKWuLYQugN0/LRMFMN81mQJIv4zjw=";
144+
version = "1.0.20";
145+
sha256 = "sha256-XsDge5xIp4QGSWAL+W4UC0++nlAX4d3T6JjhXAo4PtA=";
178146
};
179147
beamDeps = [ p1_utils ];
180148
};
@@ -200,61 +168,61 @@ let
200168
};
201169
idna = builder {
202170
name = "idna";
203-
version = "6.1.1";
171+
version = "7.1.0";
204172
src = fetchHex {
205173
pkg = "idna";
206-
version = "6.1.1";
207-
sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo=";
174+
version = "7.1.0";
175+
sha256 = "sha256-aulZoCW/Nt9hqMq4UI2WVIkbVCaoTETYLer/1t34xx8=";
208176
};
209-
beamDeps = [ unicode_util_compat ];
177+
beamDeps = [ ];
210178
};
211179
fast_yaml = builder {
212180
name = "fast_yaml";
213-
version = "1.0.39";
181+
version = "1.0.40";
214182
src = fetchHex {
215183
pkg = "fast_yaml";
216-
version = "1.0.39";
217-
sha256 = "sha256-JMe5q54rkmnWTkX0oqEoCWatsX0x5jNlz9PuJ3+wp40=";
184+
version = "1.0.40";
185+
sha256 = "sha256-J3BcKZAsHG8yaLqb84fV+pKLLmVbUxEPpHuOR20ys4Y=";
218186
};
219187
beamDeps = [ p1_utils ];
220188
};
221189
fast_xml = builder {
222190
name = "fast_xml";
223-
version = "1.1.57";
191+
version = "1.1.60";
224192
src = fetchHex {
225193
pkg = "fast_xml";
226-
version = "1.1.57";
227-
sha256 = "sha256-7sNOkK2sr+Rn1d2rY1oBTe1zuYtAYVVLLRlyFz2SnDk=";
194+
version = "1.1.60";
195+
sha256 = "sha256-z54nSd1HIEcCy3oEq1BFZC+gCW/fyc/y6cptPyq9N8U=";
228196
};
229197
beamDeps = [ p1_utils ];
230198
};
231199
fast_tls = builder {
232200
name = "fast_tls";
233-
version = "1.1.25";
201+
version = "1.1.26";
234202
src = fetchHex {
235203
pkg = "fast_tls";
236-
version = "1.1.25";
237-
sha256 = "sha256-WeGDtXQOZw4CuKpr5nO153eeX+W/zGef4tSZPRlJqCE=";
204+
version = "1.1.26";
205+
sha256 = "sha256-aw1N0jCQN1Zeuqms858CgI9fghWjkQGh2jPCpbG1mz8=";
238206
};
239207
beamDeps = [ p1_utils ];
240208
};
241209
ezlib = builder {
242210
name = "ezlib";
243-
version = "1.0.15";
211+
version = "1.0.16";
244212
src = fetchHex {
245213
pkg = "ezlib";
246-
version = "1.0.15";
247-
sha256 = "sha256-3RS6bBJSGvXP5pI+c+PVRfSgiX3Ga/q1KH+7euOWLqs=";
214+
version = "1.0.16";
215+
sha256 = "sha256-tIGVQEA9Hst+rmRf3/FCqNsrR22JMojTm6u5KSIlBAU=";
248216
};
249217
beamDeps = [ p1_utils ];
250218
};
251219
esip = builder {
252220
name = "esip";
253-
version = "1.0.59";
221+
version = "1.0.60";
254222
src = fetchHex {
255223
pkg = "esip";
256-
version = "1.0.59";
257-
sha256 = "sha256-C98uPDSdwLFE8XMVAynmdcalGsRz16Cy42IkX6rT++Y=";
224+
version = "1.0.60";
225+
sha256 = "sha256-BgTL1LvI2hWSwAgwz+MGIM5PZlurEZnRSjtF+v0DFE8=";
258226
};
259227
beamDeps = [
260228
fast_tls
@@ -294,21 +262,21 @@ let
294262
};
295263
eimp = builder {
296264
name = "eimp";
297-
version = "1.0.26";
265+
version = "1.0.27";
298266
src = fetchHex {
299267
pkg = "eimp";
300-
version = "1.0.26";
301-
sha256 = "sha256-2W1OhXK538QPJx5H8MsdiEk3O8mKISIyaHgXZe1SBEw=";
268+
version = "1.0.27";
269+
sha256 = "sha256-PH6D4pO8+vUKG/BU/Etit7jEhKbkIY45dwmk0NhX8/w=";
302270
};
303271
beamDeps = [ p1_utils ];
304272
};
305273
cache_tab = builder {
306274
name = "cache_tab";
307-
version = "1.0.33";
275+
version = "1.0.34";
308276
src = fetchHex {
309277
pkg = "cache_tab";
310-
version = "1.0.33";
311-
sha256 = "sha256-QlgAnrBQsiqr4MhI4jC7pYQBpolcWML/dN+2NePDWQA=";
278+
version = "1.0.34";
279+
sha256 = "sha256-DbnzF/OUHBfJ+OqBJeJe+ie77Uy/JKQsQm+tp0yCtpI=";
312280
};
313281
beamDeps = [ p1_utils ];
314282
};

0 commit comments

Comments
 (0)