diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index 65894a1ae268..24b16ea6f866 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -6,10 +6,10 @@ glib, glib-networking, gst_all_1, - gtk3, + gtk4, jq, lib, - libappindicator-gtk3, + libappindicator, librsvg, libsoup_3, makeBinaryWrapper, @@ -25,8 +25,7 @@ }: let - gtk = gtk3; - libappindicator-gtk = libappindicator-gtk3; + gtk = gtk4; libsoup = libsoup_3; webkitgtk = webkitgtk_4_1; in @@ -61,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { glib glib-networking gtk - libappindicator-gtk + libappindicator librsvg libsoup openssl diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 453c070c4d96..669490b0af88 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.4.11"; + version = "1.14.19"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-jlxR2BODV8wk0sP4Kkyza7Zr5I+Q003gldCfp2eYOt8="; + hash = "sha256-kKFqMf+l+V1kaf6bZtKfUSRYYjKc3VNgxlxic2fM2fo="; }; 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-RYyYp7LXMZP8RWZps1Esu8tW/rBM30QbH9Qrwi00adI="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; };