From 9bb090bb35ca0573fe1fbb15a0d40833ef2f4c32 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 18 Jun 2026 15:54:13 -0700
Subject: [PATCH] Update Claude and Codex flakes

---
 nixos/code.nix                                |  6 +---
 nixos/flake.lock                              | 24 ++++++-------
 ...ude-desktop-add-dir-multiple-matches.patch | 34 -------------------
 3 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 nixos/patches/claude-desktop-add-dir-multiple-matches.patch

diff --git a/nixos/code.nix b/nixos/code.nix
index b909609e..9903bd93 100644
--- a/nixos/code.nix
+++ b/nixos/code.nix
@@ -12,11 +12,7 @@ let
     src = inputs.codex-desktop-linux;
     patches = [ ./patches/codex-desktop-linux-gsettings-schemas.patch ];
   };
-  claudeDesktopSource = pkgs.applyPatches {
-    name = "claude-desktop-linux-patched";
-    src = inputs.claude-desktop;
-    patches = [ ./patches/claude-desktop-add-dir-multiple-matches.patch ];
-  };
+  claudeDesktopSource = inputs.claude-desktop;
   claudeDesktopNodePty = pkgs.callPackage "${claudeDesktopSource}/nix/node-pty.nix" {};
   claudeDesktop = pkgs.callPackage "${claudeDesktopSource}/nix/claude-desktop.nix" {
     node-pty = claudeDesktopNodePty;
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 15108890..3206f75e 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -114,11 +114,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781314818,
-        "narHash": "sha256-76EizPNWUOPLqwg6OP1KnX7XE7FEdrsJ2zQQaRKLYT4=",
+        "lastModified": 1781735477,
+        "narHash": "sha256-s66kETXt3w11uXH/njBfmmB1TOZn/MAmLL5VSqwOzqQ=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "7c3c4413d8dbe29762fb5a9cb5443c3a72a9e18a",
+        "rev": "9f444d93bf8029de1a9be31634be5a995ee5292c",
         "type": "github"
       },
       "original": {
@@ -135,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781493849,
-        "narHash": "sha256-FIJdDGH1gb4HTppTTwJSSlH5xrKr8IfpinkAWpJUpto=",
+        "lastModified": 1781747722,
+        "narHash": "sha256-4aFy+NJ3aIVi7mIPLvIubnUuDy09FwDd+kG2QpagzCY=",
         "owner": "aaddrick",
         "repo": "claude-desktop-debian",
-        "rev": "2d1d0c59ffb94c0de8a0c5627d03c28099599792",
+        "rev": "748b38854841db29b122d17515d4cf5add598994",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781038009,
-        "narHash": "sha256-MxvxXJ+EJxB9On3VfwjHLfeZFSB8Xlqz1IRpl43F76Q=",
+        "lastModified": 1781761441,
+        "narHash": "sha256-ZXJdWelt7SwbQTh18krnNgSS2SRveK4aoqO3xPdODD8=",
         "owner": "sadjow",
         "repo": "codex-cli-nix",
-        "rev": "75d6b831e036029e3d5f60b4f128dc0121730c37",
+        "rev": "e3e7751853ece92c2a05ba4e8feee54afdb668c8",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781761316,
-        "narHash": "sha256-hH+5JNKVugNkXEG0fLiGkvOySCmPERUcm+njP1+RLJw=",
+        "lastModified": 1781785128,
+        "narHash": "sha256-GQXqQIYLBNnPZNrmgt7aedf7PvO4QKKYjpVCAfowbQg=",
         "owner": "ilysenko",
         "repo": "codex-desktop-linux",
-        "rev": "9125911c8347c35177dfc76e2f5bce2b8b2e41d4",
+        "rev": "933413a679df51886ea05d1d0eeb8057e44bf764",
         "type": "github"
       },
       "original": {
diff --git a/nixos/patches/claude-desktop-add-dir-multiple-matches.patch b/nixos/patches/claude-desktop-add-dir-multiple-matches.patch
deleted file mode 100644
index 3f099e68..00000000
--- a/nixos/patches/claude-desktop-add-dir-multiple-matches.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/scripts/patches/config.sh b/scripts/patches/config.sh
-index 2453488..7c3f510 100644
---- a/scripts/patches/config.sh
-+++ b/scripts/patches/config.sh
-@@ -208,12 +208,7 @@ let patchCount = 0;
- 
-     // Count assertion: exactly 1 match expected
-     const escaped = match[0].replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
--    const allMatches = code.match(new RegExp(escaped, 'g'));
--    if (allMatches && allMatches.length > 1) {
--        console.error('FATAL: --add-dir pattern matches ' +
--            allMatches.length + ' times (expected 1).');
--        process.exit(1);
--    }
-+    const replacementCount = (code.match(new RegExp(escaped, 'g')) || []).length;
- 
-     let filtered;
-     if (variant === 'for-of') {
-@@ -230,9 +225,12 @@ let patchCount = 0;
-             '.push("--add-dir",' + iterVar + '))';
-     }
--    code = code.replace(match[0], filtered);
-+    code = code.split(match[0]).join(filtered);
-     console.log('  Filtered --add-dir dispatch (' +
--        variant + ' variant)');
--    patchCount++;
-+        variant + ' variant' +
-+        (replacementCount > 1
-+            ? ', ' + replacementCount + ' identical matches'
-+            : '') + ')');
-+    patchCount += Math.max(1, replacementCount);
- }
- 
- // ================================================================