{opencode,opencode-desktop}: 1.4.11 -> 1.14.18

Author: typedrat

pkgs/by-name/op/opencode-desktop/package.nix

@@ -6,13 +6,13 @@
   glib,
   glib-networking,
   gst_all_1,
-  gtk3,
+  gtk4,
   jq,
   lib,
-  libappindicator-gtk3,
+  libappindicator,
   librsvg,
   libsoup_3,
-  makeBinaryWrapper,
+  makeWrapper,
   nodejs,
   opencode,
   openssl,
@@ -24,12 +24,6 @@
   wrapGAppsHook4,
 }:
 
-let
-  gtk = gtk3;
-  libappindicator-gtk = libappindicator-gtk3;
-  libsoup = libsoup_3;
-  webkitgtk = webkitgtk_4_1;
-in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "opencode-desktop";
   inherit (opencode)
@@ -51,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cargo
     rustc
     jq
-    makeBinaryWrapper
+    makeWrapper
   ]
   ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ wrapGAppsHook4 ];
 
@@ -60,12 +54,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       dbus
       glib
       glib-networking
-      gtk
-      libappindicator-gtk
+      gtk4
+      libappindicator
       librsvg
-      libsoup
+      libsoup_3
       openssl
-      webkitgtk
+      webkitgtk_4_1
     ]
     ++ (with gst_all_1; [
       gst-plugins-bad # fakevideosink
@@ -75,8 +69,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   );
 
   tauriBuildFlags = [
-    "--config"
-    "tauri.conf.json"
     "--config"
     "tauri.prod.conf.json"
     "--no-sign"

pkgs/by-name/op/opencode/package.nix

@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.4.11";
+  version = "1.14.18";
 
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jlxR2BODV8wk0sP4Kkyza7Zr5I+Q003gldCfp2eYOt8=";
+    hash = "sha256-wEjksPEPzEe2BCySqjorMXrbnBWNCp+YAaCiZWV2ZIc=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -44,12 +44,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     buildPhase = ''
       runHook preBuild
 
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
       bun install \
         --cpu="*" \
         --frozen-lockfile \
+        --filter ./ \
         --filter ./packages/app \
         --filter ./packages/desktop \
         --filter ./packages/opencode \
+        --filter ./packages/shared \
         --ignore-scripts \
         --no-progress \
         --os="*"
@@ -72,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-rF+l0Hho0QEvMS5jaImhMlhKjjf1R66X20R6lEZcZeg=";
+    outputHash = "sha256-KZ/tfg84DNa56VglMWmExE3R219BXwxSmhKnLiQWOV4=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -106,14 +109,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
   env.OPENCODE_DISABLE_MODELS_FETCH = true;
   env.OPENCODE_VERSION = finalAttrs.version;
-  env.OPENCODE_CHANNEL = "stable";
+  env.OPENCODE_CHANNEL = "latest";
 
   buildPhase = ''
     runHook preBuild
 
     cd ./packages/opencode
     bun --bun ./script/build.ts --single --skip-install
-    bun --bun ./script/schema.ts config.json tui.json
+    bun --bun ./script/schema.ts schema.json
 
     runHook postBuild
   '';
@@ -134,8 +137,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
        )
      }
 
-    install -Dm644 config.json $out/share/opencode/config.json
-    install -Dm644 tui.json $out/share/opencode/tui.json
+    install -Dm644 schema.json $out/share/opencode/schema.json
 
     runHook postInstall
   '';
@@ -158,10 +160,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
 
   passthru = {
-    jsonschema = {
-      config = "${placeholder "out"}/share/opencode/config.json";
-      tui = "${placeholder "out"}/share/opencode/tui.json";
-    };
+    jsonschema = "${placeholder "out"}/share/opencode/schema.json";
     updateScript = nix-update-script {
       extraArgs = [
         "--subpackage"