From a930c635096794fd87b3c02cb85406587b49d735 Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 25 Feb 2025 21:10:06 -0300 Subject: [PATCH 01/11] emilua: 0.10.1 -> 0.11.1 Signed-off-by: lucasew --- .../development/interpreters/emilua/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 4454c45a090c..2ea4d9852b04 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -51,13 +51,13 @@ in stdenv.mkDerivation (self: { pname = "emilua"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitLab { owner = "emilua"; repo = "emilua"; - rev = "v${self.version}"; - hash = "sha256-D6XKXik9nWQ6t6EF6dLbRGB60iFbPUM8/H8iFAz1QlE="; + tag = "v${self.version}"; + hash = "sha256-Kl2atD3ejPSbwk9ByQrZrqBrHT4Wk+3AY3tvRC3jOCI="; }; propagatedBuildInputs = [ @@ -89,8 +89,7 @@ stdenv.mkDerivation (self: { dontUseCmakeConfigure = true; mesonFlags = [ - (lib.mesonBool "enable_file_io" true) - (lib.mesonBool "enable_io_uring" true) + (lib.mesonBool "enable_io_uring" false) (lib.mesonBool "enable_tests" true) (lib.mesonBool "enable_manpages" true) (lib.mesonOption "version_suffix" "-nixpkgs1") @@ -122,15 +121,15 @@ stdenv.mkDerivation (self: { sitePackages = "lib/emilua-${(lib.concatStringsSep "." (lib.take 2 (lib.splitVersion self.version)))}"; }; - meta = with lib; { + meta = { description = "Lua execution engine"; mainProgram = "emilua"; homepage = "https://emilua.org/"; - license = licenses.boost; - maintainers = with maintainers; [ + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ manipuladordedados lucasew ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) From 83b1af634488399041a904e6d4cb4133f41d09fb Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:16:13 -0300 Subject: [PATCH 02/11] emiluaPlugins.bech32: 1.1.0 -> 1.1.1 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/bech32/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/bech32/default.nix b/pkgs/development/emilua-plugins/bech32/default.nix index 338913764b66..dee2e9973768 100644 --- a/pkgs/development/emilua-plugins/bech32/default.nix +++ b/pkgs/development/emilua-plugins/bech32/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "emilua-bech32"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "emilua"; repo = "bech32"; rev = "v${version}"; - hash = "sha256-f4KFL2RV+fAVJrgaAQWKuLwlN440j9vBbiyk5fHrwiE="; + hash = "sha256-DJUdwnX9jHKpVYRkP/UFYNefphbqCoUIjXLTNQ5umis="; }; buildInputs = [ From 7fab5aa8694522c20e2dc7792be8c8be3f7a9114 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:16:58 -0300 Subject: [PATCH 03/11] emiluaPlugins.botan: 1.1.0 -> 1.1.1 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/botan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/botan/default.nix b/pkgs/development/emilua-plugins/botan/default.nix index 895e40028198..9f9ec4cce648 100644 --- a/pkgs/development/emilua-plugins/botan/default.nix +++ b/pkgs/development/emilua-plugins/botan/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "emilua-botan"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "emilua"; repo = "botan"; rev = "v${version}"; - hash = "sha256-5/vcm6vNucBhl1Aki+OFNjAU7Hvc7OLAAH4CYchlBIY="; + hash = "sha256-oqJEsVe/mF/v6pCrDDG/Tug4st+LsSlYs4oRvfri8Tc="; }; buildInputs = [ From 4e44068f70b7ec6efbe135b06053fa7187b3edbf Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:18:11 -0300 Subject: [PATCH 04/11] emiluaPlugins.qt5: 1.0.1 -> 1.0.2 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/qt5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/qt5/default.nix b/pkgs/development/emilua-plugins/qt5/default.nix index 95b8919f723c..a8667331ad00 100644 --- a/pkgs/development/emilua-plugins/qt5/default.nix +++ b/pkgs/development/emilua-plugins/qt5/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "emilua-qt5"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitLab { owner = "emilua"; repo = "qt5"; rev = "v${version}"; - hash = "sha256-FkBfzGzUX7dvHjWRBjVwppU4jZBbY02gP+fIta8mjIw="; + hash = "sha256-9w9E0RWwW3scbmOOXdOXj22LR65a6XBHDkC8eimAfUs="; }; buildInputs = [ From d4509228735cf549314de794241243a95ef13ecc Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:19:18 -0300 Subject: [PATCH 05/11] emiluaPlugins.qt6: 1.1.0 -> 1.2.0 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/qt6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/qt6/default.nix b/pkgs/development/emilua-plugins/qt6/default.nix index db8eaeeecb49..1a482ef91053 100644 --- a/pkgs/development/emilua-plugins/qt6/default.nix +++ b/pkgs/development/emilua-plugins/qt6/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "emilua-qt6"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitLab { owner = "emilua"; repo = "qt6"; rev = "v${version}"; - hash = "sha256-tSVJTEPLQ5z1OPtyNiu71AZcVmgzD7oWhDI8ccctGOQ="; + hash = "sha256-/GIEMkJnF/nubbTya9SDm3Zb8dvdbPQCMrgKtRtIrMs="; }; buildInputs = with qt6Packages; [ From fab6de0e0d9bf7d4224c01dbc55cd23c36e0594c Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:20:46 -0300 Subject: [PATCH 06/11] emiluaPlugins.secp256k1: 0.5.0 -> 0.5.1 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/secp256k1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/secp256k1/default.nix b/pkgs/development/emilua-plugins/secp256k1/default.nix index 6b83ed573dc1..64dd6ad939ea 100644 --- a/pkgs/development/emilua-plugins/secp256k1/default.nix +++ b/pkgs/development/emilua-plugins/secp256k1/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "emilua-secp256k1"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitLab { owner = "emilua"; repo = "secp256k1"; rev = "v${version}"; - hash = "sha256-xbyDKxuU03U0k4YSD7Sahw2Z4ZSpQHwrpWcSN0F5CCw="; + hash = "sha256-u3o6kE1HykxH2KbrJmNTDz9IbT+e26Vxze5RzvfCfVA="; }; buildInputs = [ From ecfe28c6a828cd41eb2461841f10ef1334e94898 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:21:27 -0300 Subject: [PATCH 07/11] emiluaPlugins.tdlib: 1.0.3 -> 1.0.4 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/tdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/tdlib/default.nix b/pkgs/development/emilua-plugins/tdlib/default.nix index 96c33efee197..611c1cd33b16 100644 --- a/pkgs/development/emilua-plugins/tdlib/default.nix +++ b/pkgs/development/emilua-plugins/tdlib/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "emilua-tdlib"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitLab { owner = "emilua"; repo = "tdlib"; rev = "v${version}"; - hash = "sha256-14jg71m1za+WW0PP9cg1XniCupl9/RXqeEP1SE+62Ng="; + hash = "sha256-dqbSECQLM664l2QrkEAfT65/NBI0ghj286dt7eaxcks="; fetchSubmodules = true; }; From f5d2ed22c3e50c20f5952d14889ca9809944e572 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:22:07 -0300 Subject: [PATCH 08/11] emiluaPackages.this-thread: 1.0.1 -> 1.0.2 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/this-thread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/this-thread/default.nix b/pkgs/development/emilua-plugins/this-thread/default.nix index 7351ed474a87..97d8126f9de7 100644 --- a/pkgs/development/emilua-plugins/this-thread/default.nix +++ b/pkgs/development/emilua-plugins/this-thread/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "emilua-this-thread"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitLab { owner = "emilua"; repo = "this-thread"; rev = "v${version}"; - hash = "sha256-AvvRHy5llxkYt7aRO0KepCX032hhxhOr/c680VBrnBQ="; + hash = "sha256-K9RQh/OnbQnqltfT9y36N/hEZxzbMP2aOJJ12FhAzHM="; }; buildInputs = [ From 1603fbcdaf8b03695c1693149be4e254b05d81a1 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 20:45:51 -0300 Subject: [PATCH 09/11] emiluaPlugins.beast: 1.1.1 -> 1.1.2 Signed-off-by: lucasew --- pkgs/development/emilua-plugins/beast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/emilua-plugins/beast/default.nix b/pkgs/development/emilua-plugins/beast/default.nix index 9b28bed49ac3..bbab09fe2161 100644 --- a/pkgs/development/emilua-plugins/beast/default.nix +++ b/pkgs/development/emilua-plugins/beast/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (self: { pname = "emilua_beast"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "emilua"; repo = "beast"; rev = "v${self.version}"; - hash = "sha256-8pHL0ut221LvFwb/o1GuLV3gIDw5LSeqxqIa9eaQjXY="; + hash = "sha256-MASaZvhIVKmeBUcn/NjlBZ+xh+2RgwHBH2o08lklGa0="; }; buildInputs = [ From f734b740fc7466f5646ffc860cbc4c9574c7c95e Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 28 Feb 2025 21:05:10 -0300 Subject: [PATCH 10/11] emiluaPlugins.beast: add meta Signed-off-by: lucasew --- pkgs/development/emilua-plugins/beast/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/emilua-plugins/beast/default.nix b/pkgs/development/emilua-plugins/beast/default.nix index bbab09fe2161..74a4222b28e2 100644 --- a/pkgs/development/emilua-plugins/beast/default.nix +++ b/pkgs/development/emilua-plugins/beast/default.nix @@ -1,4 +1,5 @@ { + lib, stdenv, emilua, meson, @@ -34,4 +35,15 @@ stdenv.mkDerivation (self: { ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Emilua bindings to Boost.Beast (a WebSocket library)"; + homepage = "https://gitlab.com/emilua/beast"; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ + manipuladordedados + lucasew + ]; + platforms = lib.platforms.linux; + }; }) From 5189fc147bed55dcea59fa53c87bea455d6f0983 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 1 Mar 2025 10:23:35 -0300 Subject: [PATCH 11/11] emilua: opt-in io_uring Signed-off-by: lucasew --- pkgs/development/interpreters/emilua/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 2ea4d9852b04..dfeb38ab2b85 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -23,6 +23,8 @@ asciidoctor, makeWrapper, gitUpdater, + enableIoUring ? false, + emilua, # this package }: let @@ -89,7 +91,8 @@ stdenv.mkDerivation (self: { dontUseCmakeConfigure = true; mesonFlags = [ - (lib.mesonBool "enable_io_uring" false) + (lib.mesonBool "enable_io_uring" enableIoUring) + (lib.mesonBool "enable_file_io" enableIoUring) (lib.mesonBool "enable_tests" true) (lib.mesonBool "enable_manpages" true) (lib.mesonOption "version_suffix" "-nixpkgs1") @@ -99,7 +102,8 @@ stdenv.mkDerivation (self: { patchShebangs src/emilua_gperf.awk --interpreter '${lib.getExe gawk} -f' ''; - doCheck = true; + # io_uring is not allowed in Nix sandbox, that breaks the tests + doCheck = !enableIoUring; mesonCheckFlags = [ # Skipped test: libpsx @@ -119,6 +123,7 @@ stdenv.mkDerivation (self: { updateScript = gitUpdater { rev-prefix = "v"; }; inherit boost; sitePackages = "lib/emilua-${(lib.concatStringsSep "." (lib.take 2 (lib.splitVersion self.version)))}"; + tests.with-io-uring = emilua.override { enableIoUring = true; }; }; meta = {