evan/nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(cleanup): sops, opencode, etc

Browse Source
This commit is contained in:
Evan Reichard
2026-01-11 22:19:31 -05:00
parent 1fe9396284
commit c8f5e744d0
32 changed files with 1210 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/opencode/default.nix
View File

@@ -13,12 +13,12 @@
}:
let
pname = "opencode";
version = "1.1.4";
version = "1.1.12";
src = fetchFromGitHub {
owner = "anomalyco";
repo = "opencode";
tag = "v${version}";
hash = "sha256-i9IO9FSZ2Mw0tPqFxfQfSbejx04J1eJ0IYy5fa77O2Y=";
hash = "sha256-k6wRBtWFwyLWJ6R0el3dY/nBlg2t+XkTpsuEseLXp+E=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -75,7 +75,7 @@ let
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-tea/pSuUOELsSSMdwi0mmG5GsFZpqR5MlyQvVUno7dM=";
outputHash = "sha256-vRIWQt02VljcoYG3mwJy8uCihSTB/OLypyw+vt8LuL8=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
@@ -95,8 +95,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
];
patches = [
# NOTE: Relax Bun version check to be a warning instead of an error
./relax-bun-version-check.patch
./relax-bun-version-check.patch # NOTE: Relax Bun version check to be a warning instead of an error
./root_fix.patch # https://github.com/anomalyco/opencode/pull/7691
];
configurePhase = ''

31
packages/opencode/root_fix.patch Normal file
View File

@@ -0,0 +1,31 @@
diff --git i/packages/opencode/src/lsp/server.ts w/packages/opencode/src/lsp/server.ts
index 24da77edc..b94285ba8 100644
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -94,7 +94,7 @@ export namespace LSPServer {
),
extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"],
async spawn(root) {
- const tsserver = await Bun.resolve("typescript/lib/tsserver.js", Instance.directory).catch(() => {})
+ const tsserver = await Bun.resolve("typescript/lib/tsserver.js", root).catch(() => {})
log.info("typescript server", { tsserver })
if (!tsserver) return
const proc = spawn(BunProc.which(), ["x", "typescript-language-server", "--stdio"], {
@@ -169,7 +169,7 @@ export namespace LSPServer {
root: NearestRoot(["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"]),
extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts", ".vue"],
async spawn(root) {
- const eslint = await Bun.resolve("eslint", Instance.directory).catch(() => {})
+ const eslint = await Bun.resolve("eslint", root).catch(() => {})
if (!eslint) return
log.info("spawning eslint server")
const serverPath = path.join(Global.Path.bin, "vscode-eslint", "server", "out", "eslintServer.js")
@@ -1081,7 +1081,7 @@ export namespace LSPServer {
extensions: [".astro"],
root: NearestRoot(["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"]),
async spawn(root) {
- const tsserver = await Bun.resolve("typescript/lib/tsserver.js", Instance.directory).catch(() => {})
+ const tsserver = await Bun.resolve("typescript/lib/tsserver.js", root).catch(() => {})
if (!tsserver) {
log.info("typescript not found, required for Astro language server")
return