From fd1027178cb000a92b6ca9c06060a464c9dfc4b4 Mon Sep 17 00:00:00 2001
From: Harivansh Rathi <rathiharivansh@gmail.com>
Date: Sun, 29 Mar 2026 16:29:33 -0400
Subject: [PATCH] use pkgs.codex instead of broken openai/codex flake

---
 flake.lock           | 63 +++++++++++++++++++++++++++++++++++++++++---
 flake.nix            |  3 ---
 lib/package-sets.nix |  4 +--
 3 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7bb5df8..19ce477 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,6 +56,25 @@
         "type": "github"
       }
     },
+    "codex": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1774808374,
+        "narHash": "sha256-sdZo+xCeWfIV+sbW8UaYopyXnUkP5IrqMLiPGS3jgP8=",
+        "owner": "openai",
+        "repo": "codex",
+        "rev": "38e648ca67802d5f2fb23f9b3bd3f200cdb067fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "openai",
+        "repo": "codex",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -211,6 +230,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1769461804,
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1774701658,
         "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
@@ -226,7 +261,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1767640445,
         "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
@@ -244,7 +279,7 @@
     },
     "openspec": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1772182342,
@@ -264,15 +299,37 @@
       "inputs": {
         "agentcomputer-cli": "agentcomputer-cli",
         "claudeCode": "claudeCode",
+        "codex": "codex",
         "disko": "disko",
         "googleworkspace-cli": "googleworkspace-cli",
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "openspec": "openspec"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "codex",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769828398,
+        "narHash": "sha256-zmnvRUm15QrlKH0V1BZoiT3U+Q+tr+P5Osi8qgtL9fY=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "a1d32c90c8a4ea43e9586b7e5894c179d5747425",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index b8b393e..557a243 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,9 +24,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    codex = {
-      url = "github:openai/codex";
-    };
 
     agentcomputer-cli = {
       url = "path:/Users/rathi/Documents/GitHub/companion/agentcomputer/apps/cli";
diff --git a/lib/package-sets.nix b/lib/package-sets.nix
index 2d7da03..33cbb11 100644
--- a/lib/package-sets.nix
+++ b/lib/package-sets.nix
@@ -7,8 +7,6 @@
     inputs.googleworkspace-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
   claudePackage =
     inputs.claudeCode.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  codexPackage =
-    inputs.codex.packages.${pkgs.stdenv.hostPlatform.system}.default;
   agentcomputerPackage =
     inputs.agentcomputer-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
   openspecPackage =
@@ -107,7 +105,7 @@ in {
     (with pkgs; [
       awscli2
       claudePackage
-      codexPackage
+      pkgs.codex
       coreutils-prefixed
       delta
       diff-so-fancy