Skip to content

Commit 2f9286d

Browse files
authored
emilua: 0.10.1 -> 0.11.1, update plugins (#385926)
2 parents 0405645 + 5189fc1 commit 2f9286d

File tree

9 files changed

+42
-26
lines changed

9 files changed

+42
-26
lines changed

pkgs/development/emilua-plugins/beast/default.nix

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
lib,
23
stdenv,
34
emilua,
45
meson,
@@ -12,13 +13,13 @@
1213

1314
stdenv.mkDerivation (self: {
1415
pname = "emilua_beast";
15-
version = "1.1.1";
16+
version = "1.1.2";
1617

1718
src = fetchFromGitLab {
1819
owner = "emilua";
1920
repo = "beast";
2021
rev = "v${self.version}";
21-
hash = "sha256-8pHL0ut221LvFwb/o1GuLV3gIDw5LSeqxqIa9eaQjXY=";
22+
hash = "sha256-MASaZvhIVKmeBUcn/NjlBZ+xh+2RgwHBH2o08lklGa0=";
2223
};
2324

2425
buildInputs = [
@@ -34,4 +35,15 @@ stdenv.mkDerivation (self: {
3435
];
3536

3637
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
38+
39+
meta = {
40+
description = "Emilua bindings to Boost.Beast (a WebSocket library)";
41+
homepage = "https://gitlab.com/emilua/beast";
42+
license = lib.licenses.boost;
43+
maintainers = with lib.maintainers; [
44+
manipuladordedados
45+
lucasew
46+
];
47+
platforms = lib.platforms.linux;
48+
};
3749
})

pkgs/development/emilua-plugins/bech32/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
stdenv.mkDerivation rec {
2323
pname = "emilua-bech32";
24-
version = "1.1.0";
24+
version = "1.1.1";
2525

2626
src = fetchFromGitLab {
2727
owner = "emilua";
2828
repo = "bech32";
2929
rev = "v${version}";
30-
hash = "sha256-f4KFL2RV+fAVJrgaAQWKuLwlN440j9vBbiyk5fHrwiE=";
30+
hash = "sha256-DJUdwnX9jHKpVYRkP/UFYNefphbqCoUIjXLTNQ5umis=";
3131
};
3232

3333
buildInputs = [

pkgs/development/emilua-plugins/botan/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
stdenv.mkDerivation rec {
2222
pname = "emilua-botan";
23-
version = "1.1.0";
23+
version = "1.1.1";
2424

2525
src = fetchFromGitLab {
2626
owner = "emilua";
2727
repo = "botan";
2828
rev = "v${version}";
29-
hash = "sha256-5/vcm6vNucBhl1Aki+OFNjAU7Hvc7OLAAH4CYchlBIY=";
29+
hash = "sha256-oqJEsVe/mF/v6pCrDDG/Tug4st+LsSlYs4oRvfri8Tc=";
3030
};
3131

3232
buildInputs = [

pkgs/development/emilua-plugins/qt5/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
stdenv.mkDerivation rec {
2424
pname = "emilua-qt5";
25-
version = "1.0.1";
25+
version = "1.0.2";
2626

2727
src = fetchFromGitLab {
2828
owner = "emilua";
2929
repo = "qt5";
3030
rev = "v${version}";
31-
hash = "sha256-FkBfzGzUX7dvHjWRBjVwppU4jZBbY02gP+fIta8mjIw=";
31+
hash = "sha256-9w9E0RWwW3scbmOOXdOXj22LR65a6XBHDkC8eimAfUs=";
3232
};
3333

3434
buildInputs = [

pkgs/development/emilua-plugins/qt6/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
stdenv.mkDerivation rec {
2525
pname = "emilua-qt6";
26-
version = "1.1.0";
26+
version = "1.2.0";
2727

2828
src = fetchFromGitLab {
2929
owner = "emilua";
3030
repo = "qt6";
3131
rev = "v${version}";
32-
hash = "sha256-tSVJTEPLQ5z1OPtyNiu71AZcVmgzD7oWhDI8ccctGOQ=";
32+
hash = "sha256-/GIEMkJnF/nubbTya9SDm3Zb8dvdbPQCMrgKtRtIrMs=";
3333
};
3434

3535
buildInputs = with qt6Packages; [

pkgs/development/emilua-plugins/secp256k1/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
stdenv.mkDerivation rec {
2222
pname = "emilua-secp256k1";
23-
version = "0.5.0";
23+
version = "0.5.1";
2424

2525
src = fetchFromGitLab {
2626
owner = "emilua";
2727
repo = "secp256k1";
2828
rev = "v${version}";
29-
hash = "sha256-xbyDKxuU03U0k4YSD7Sahw2Z4ZSpQHwrpWcSN0F5CCw=";
29+
hash = "sha256-u3o6kE1HykxH2KbrJmNTDz9IbT+e26Vxze5RzvfCfVA=";
3030
};
3131

3232
buildInputs = [

pkgs/development/emilua-plugins/tdlib/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ let
3535
in
3636
stdenv.mkDerivation rec {
3737
pname = "emilua-tdlib";
38-
version = "1.0.3";
38+
version = "1.0.4";
3939

4040
src = fetchFromGitLab {
4141
owner = "emilua";
4242
repo = "tdlib";
4343
rev = "v${version}";
44-
hash = "sha256-14jg71m1za+WW0PP9cg1XniCupl9/RXqeEP1SE+62Ng=";
44+
hash = "sha256-dqbSECQLM664l2QrkEAfT65/NBI0ghj286dt7eaxcks=";
4545
fetchSubmodules = true;
4646
};
4747

pkgs/development/emilua-plugins/this-thread/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
stdenv.mkDerivation rec {
2121
pname = "emilua-this-thread";
22-
version = "1.0.1";
22+
version = "1.0.2";
2323

2424
src = fetchFromGitLab {
2525
owner = "emilua";
2626
repo = "this-thread";
2727
rev = "v${version}";
28-
hash = "sha256-AvvRHy5llxkYt7aRO0KepCX032hhxhOr/c680VBrnBQ=";
28+
hash = "sha256-K9RQh/OnbQnqltfT9y36N/hEZxzbMP2aOJJ12FhAzHM=";
2929
};
3030

3131
buildInputs = [

pkgs/development/interpreters/emilua/default.nix

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
asciidoctor,
2424
makeWrapper,
2525
gitUpdater,
26+
enableIoUring ? false,
27+
emilua, # this package
2628
}:
2729

2830
let
@@ -51,13 +53,13 @@ in
5153

5254
stdenv.mkDerivation (self: {
5355
pname = "emilua";
54-
version = "0.10.1";
56+
version = "0.11.1";
5557

5658
src = fetchFromGitLab {
5759
owner = "emilua";
5860
repo = "emilua";
59-
rev = "v${self.version}";
60-
hash = "sha256-D6XKXik9nWQ6t6EF6dLbRGB60iFbPUM8/H8iFAz1QlE=";
61+
tag = "v${self.version}";
62+
hash = "sha256-Kl2atD3ejPSbwk9ByQrZrqBrHT4Wk+3AY3tvRC3jOCI=";
6163
};
6264

6365
propagatedBuildInputs = [
@@ -89,8 +91,8 @@ stdenv.mkDerivation (self: {
8991
dontUseCmakeConfigure = true;
9092

9193
mesonFlags = [
92-
(lib.mesonBool "enable_file_io" true)
93-
(lib.mesonBool "enable_io_uring" true)
94+
(lib.mesonBool "enable_io_uring" enableIoUring)
95+
(lib.mesonBool "enable_file_io" enableIoUring)
9496
(lib.mesonBool "enable_tests" true)
9597
(lib.mesonBool "enable_manpages" true)
9698
(lib.mesonOption "version_suffix" "-nixpkgs1")
@@ -100,7 +102,8 @@ stdenv.mkDerivation (self: {
100102
patchShebangs src/emilua_gperf.awk --interpreter '${lib.getExe gawk} -f'
101103
'';
102104

103-
doCheck = true;
105+
# io_uring is not allowed in Nix sandbox, that breaks the tests
106+
doCheck = !enableIoUring;
104107

105108
mesonCheckFlags = [
106109
# Skipped test: libpsx
@@ -120,17 +123,18 @@ stdenv.mkDerivation (self: {
120123
updateScript = gitUpdater { rev-prefix = "v"; };
121124
inherit boost;
122125
sitePackages = "lib/emilua-${(lib.concatStringsSep "." (lib.take 2 (lib.splitVersion self.version)))}";
126+
tests.with-io-uring = emilua.override { enableIoUring = true; };
123127
};
124128

125-
meta = with lib; {
129+
meta = {
126130
description = "Lua execution engine";
127131
mainProgram = "emilua";
128132
homepage = "https://emilua.org/";
129-
license = licenses.boost;
130-
maintainers = with maintainers; [
133+
license = lib.licenses.boost;
134+
maintainers = with lib.maintainers; [
131135
manipuladordedados
132136
lucasew
133137
];
134-
platforms = platforms.linux;
138+
platforms = lib.platforms.linux;
135139
};
136140
})

0 commit comments

Comments
 (0)