From a1a326186acf861fdafb717d869c34dfbe8be037 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Thu, 1 May 2025 17:57:57 -0400
Subject: [PATCH 1/2] maintainers: add samestep

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2a95930545f9..a897fa2f43d2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21567,6 +21567,12 @@
     github = "samemrecebi";
     githubId = 64419750;
   };
+  samestep = {
+    name = "Sam Estep";
+    email = "sam@samestep.com";
+    github = "samestep";
+    githubId = 8246041;
+  };
   samfundev = {
     name = "samfundev";
     github = "samfundev";

From 5c28ddb1e5db6e5be108e6e4751b0803a96ffe96 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Thu, 1 May 2025 18:01:52 -0400
Subject: [PATCH 2/2] jai: init at 0.2.010

---
 pkgs/by-name/ja/jai/package.nix | 50 +++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/ja/jai/package.nix

diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
new file mode 100644
index 000000000000..6ca0060f3c64
--- /dev/null
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -0,0 +1,50 @@
+{
+  buildFHSEnv,
+  lib,
+  requireFile,
+  runCommand,
+  stdenv,
+  unzip,
+}:
+let
+  pname = "jai";
+  minor = "2";
+  patch = "010";
+  version = "0.${minor}.${patch}";
+  zipName = "jai-beta-${minor}-${patch}.zip";
+  jai = stdenv.mkDerivation {
+    name = "jai";
+    src = requireFile {
+      message = ''
+        The language is not yet public. If you are in the closed beta, download the zip file and run the following command:
+          nix-store --add-fixed sha256 ${zipName}
+      '';
+      name = zipName;
+      sha256 = "sha256-7S0DFvmiKEvmCT12ukwLu+SSitk4y6BuS6WWCImeOhc=";
+    };
+    nativeBuildInputs = [ unzip ];
+    buildCommand = "unzip $src -d $out";
+  };
+  meta = {
+    description = "Powerful language to write efficient reliable software in simple ways";
+    license = lib.licenses.unfree;
+    mainProgram = "jai";
+    maintainers = with lib.maintainers; [ samestep ];
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+  };
+in
+if stdenv.isLinux then
+  buildFHSEnv {
+    inherit meta pname version;
+    targetPkgs = pkgs: [ pkgs.zlib ];
+    runScript = "${jai}/jai/bin/jai-linux";
+  }
+else
+  runCommand "jai" { inherit meta pname version; } ''
+    mkdir -p $out/bin
+    ln -s ${jai}/jai/bin/jai-macos $out/bin/jai
+  ''