colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Claude and Codex flakes

Browse Source
This commit is contained in:
Ivan Malison
2026-06-18 15:54:13 -07:00
parent 9d09b33e3e
commit 9bb090bb35
3 changed files with 13 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/code.nix
View File

@@ -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;

24
nixos/flake.lock generated
View File

@@ -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": {

34
nixos/patches/claude-desktop-add-dir-multiple-matches.patch
View File

@@ -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);
}
// ================================================================