Merge master into staging-next

6 files changed, 144 insertions, 20 deletions

diff --git a/pkgs/development/compilers/coffeescript/default.nix b/pkgs/development/compilers/coffeescript/default.nix
new file mode 100644
index 0000000000000..5245a25bba880
--- /dev/null
+++ b/pkgs/development/compilers/coffeescript/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "coffeescript";
+  version = "2.7.0";
+
+  src = fetchFromGitHub {
+    owner = "jashkenas";
+    repo = "coffeescript";
+    rev = version;
+    hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0=";
+  };
+
+  npmDepsHash = "sha256-mCm31OwI3wjq8taKRQuEj4+IWVZO9Z5KuIDBf39lYoQ=";
+
+  env = {
+    PUPPETEER_SKIP_DOWNLOAD = true;
+  };
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "A little language that compiles into JavaScript";
+    homepage = "https://github.com/jashkenas/coffeescript";
+    license = lib.licenses.mit;
+    mainProgram = "coffee";
+    maintainers = with lib.maintainers; [ cdmistman ];
+  };
+}
diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix
new file mode 100644
index 0000000000000..a938d19736ec5
--- /dev/null
+++ b/pkgs/development/interpreters/emilua/default.nix
@@ -0,0 +1,111 @@
+{ lib
+, stdenv
+, meson
+, ninja
+, fetchFromGitHub
+, fetchFromGitLab
+, re2c
+, gperf
+, gawk
+, xxd
+, pkg-config
+, boost182
+, fmt
+, luajit_openresty
+, ncurses
+, serd
+, sord
+, libcap
+, liburing
+, openssl
+, asciidoctor
+}:
+
+let
+  emilua-http-wrap = fetchFromGitHub {
+      owner = "BoostGSoC14";
+      repo = "boost.http";
+      rev = "93ae527c89ffc517862e1f5f54c8a257278f1195";
+      name = "emilua-http";
+      hash = "sha256-MN29YwkTi0TJ2V+vRI9nUIxvJKsG+j3nT3o0yQB3p0o=";
+  };
+
+  trial-protocol-wrap = fetchFromGitHub {
+      owner = "breese";
+      repo = "trial.protocol";
+      rev = "79149f604a49b8dfec57857ca28aaf508069b669";
+      name = "trial-protocol";
+      hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw=";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "emilua";
+  version = "0.4.3";
+
+  src = fetchFromGitLab {
+      owner = "emilua";
+      repo = "emilua";
+      rev = "v${version}";
+      hash = "sha256-vZITPQ1qUHhw24c0HKdR6VenviOc6JizQQ8w7K94irc=";
+  };
+
+  buildInputs = [
+    luajit_openresty
+    boost182
+    fmt
+    ncurses
+    serd
+    sord
+    libcap
+    liburing
+    openssl
+  ];
+
+  nativeBuildInputs = [
+    re2c
+    gperf
+    gawk
+    xxd
+    pkg-config
+    asciidoctor
+    meson
+    ninja
+  ];
+
+  # Meson is no longer able to pick up Boost automatically.
+  # https://github.com/NixOS/nixpkgs/issues/86131
+  env = {
+    BOOST_INCLUDEDIR = "${lib.getDev boost182}/include";
+    BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib";
+  };
+
+  mesonFlags = [
+    "-Dversion_suffix=-nixpkgs1"
+    "-Denable_http=true"
+    "-Denable_file_io=true"
+    "-Denable_io_uring=true"
+    "-Denable_linux_namespaces=true"
+    "-Denable_tests=true"
+    "-Denable_manpages=true"
+  ];
+
+  postPatch = ''
+    pushd subprojects
+    cp -r ${emilua-http-wrap} emilua-http
+    cp -r ${trial-protocol-wrap} trial-protocol
+    chmod +w emilua-http trial-protocol
+    cp "packagefiles/emilua-http/meson.build" "emilua-http/"
+    cp "packagefiles/trial.protocol/meson.build" "trial-protocol/"
+    popd
+
+    substituteInPlace src/emilua_gperf.awk  --replace '#!/usr/bin/env -S gawk --file' '#!${gawk}/bin/gawk -f'
+  '';
+
+  meta = with lib; {
+    description = "Lua execution engine";
+    homepage = "https://emilua.org/";
+    license = licenses.boost;
+    maintainers = with maintainers; [ manipuladordedados ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index a4cd109fc1d4d..2ebe88a96a91b 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -58,6 +58,7 @@ mapAliases {
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) clean-css-cli; # added 2023-08-18
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
+  coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   inherit (pkgs) cordova; # added 2023-08-18
   dat = throw "dat was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index 88aad2e1a1957..ed253a2113451 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -5,7 +5,6 @@
   "@electron-forge/cli" = "electron-forge";
   "@microsoft/rush" = "rush";
   "@webassemblyjs/cli-1.11.1" = "wasm2wast";
-  coffee-script = "coffee";
   "@withgraphite/graphite-cli" = "gt";
 
   # Packages that provide a single executable.
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 2a91306992040..a95b47b6104fa 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -89,7 +89,6 @@
 , "coc-yaml"
 , "coc-yank"
 , "code-theme-converter"
-, "coffee-script"
 , "coinmon"
 , "concurrently"
 , "conventional-changelog-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index eadfbf067d436..89a0652689a61 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -80103,24 +80103,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coffee-script = nodeEnv.buildNodePackage {
-    name = "coffee-script";
-    packageName = "coffee-script";
-    version = "1.12.7";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Unfancy JavaScript";
-      homepage = "http://coffeescript.org";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coinmon = nodeEnv.buildNodePackage {
     name = "coinmon";
     packageName = "coinmon";