fHEADmaster

4 files changed, 95 insertions, 3 deletions

diff --git a/derivations/codex/flake.lock b/derivations/codex/flake.lock
new file mode 100644
index 0000000..05b1cf8
--- /dev/null
+++ b/derivations/codex/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1752480373,
+        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/derivations/codex/flake.nix b/derivations/codex/flake.nix
index 3a0a46f..38ad305 100644
--- a/derivations/codex/flake.nix
+++ b/derivations/codex/flake.nix
@@ -12,8 +12,14 @@
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
   in {
-    packages.${system}.default = pkgs.callPackage ./default.nix {
-      inherit (pkgs) lib buildNpmPackage fetchFromGitHub fetchNpmDeps gitUpdater;
+    packages.${system}.rust = pkgs.callPackage ./rust.nix {
+      inherit (pkgs) lib rustPlatform fetchFromGitHub nix-update-script pkg-config openssl versionCheckHook;
+    };
+    packages.${system}.node = pkgs.callPackage ./node.nix {
+      inherit (pkgs) lib fetchFromGitHub jq makeWrapper;
+      node = pkgs.nodejs_22;
+      pnpm = pkgs.pnpm_10;
+      mkDerivation = pkgs.stdenv.mkDerivation;
     };
   };
 }
diff --git a/derivations/codex/node.nix b/derivations/codex/node.nix
new file mode 100644
index 0000000..7cf50d5
--- /dev/null
+++ b/derivations/codex/node.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  mkDerivation,
+  fetchFromGitHub,
+  pnpm,
+  node,
+  jq,
+  makeWrapper,
+}:
+mkDerivation (finalAttrs: {
+  pname = "codex-cli";
+  version = "0.8.0";
+  src = fetchFromGitHub {
+    owner = "openai";
+    repo = "codex";
+    rev = "4082246f6aac288a817330b92cfd5573df61f0e7";
+    # tag = "v${finalAttrs.version}";
+    sha256 = "DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c=";
+  };
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-otogkSsKJ5j1BY00y4SRhL9pm7CK9nmzVisvGCDIMlU=";
+  };
+  nativeBuildInputs = [
+    node
+    pnpm
+    pnpm.configHook
+    jq
+    makeWrapper
+  ];
+  pnpmInstallFlags = ["--frozen-lockfile"];
+
+  buildPhase = ''
+    runHook preBuild
+    pnpm install --offline --frozen-lockfile
+    pnpm --filter ./codex-cli... run build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    pkgRoot=$out/lib/node_modules/${final.pname}
+    mkdir -p $pkgRoot
+    cp -R codex-cli/* $pkgRoot/
+
+    path=$(jq -r '.bin.codex' codex-cli/package.json)
+    mkdir -p $out/bin
+    makeWrapper ${node}/bin/node $out/bin/codex --add-flags "$pkgRoot/$path"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "OpenAI Codex command‑line interface";
+    license = licenses.asl20;
+    homepage = "https://github.com/openai/codex";
+  };
+})
diff --git a/derivations/codex/default.nix b/derivations/codex/rust.nix
index 5a0f366..e07fb79 100644
--- a/derivations/codex/default.nix
+++ b/derivations/codex/rust.nix
@@ -9,7 +9,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.7.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "openai";