From d674b2f02b65ab85dbb70e94d1befb1e85b4d1ff Mon Sep 17 00:00:00 2001 From: m3tm3re
Date: Tue, 20 Jan 2026 20:57:31 +0100 Subject: [PATCH] fix: gitea workflow --- .gitea/workflows/nix-update.yml | 6 +++--- flake.nix | 10 ++++++++-- pkgs/default.nix | 16 +++++++++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/nix-update.yml b/.gitea/workflows/nix-update.yml index 1af7c61..8735a2a 100644 --- a/.gitea/workflows/nix-update.yml +++ b/.gitea/workflows/nix-update.yml @@ -59,8 +59,8 @@ jobs: echo "::group::Checking for opencode updates" - # Get latest release from GitHub API - LATEST_RELEASE=$(curl -s "https://api.github.com/repos/anomalyco/opencode/releases/latest" | jq -r '.tag_name') + # Get latest release from GitHub API (strip v prefix for comparison) + LATEST_RELEASE=$(curl -s "https://api.github.com/repos/anomalyco/opencode/releases/latest" | jq -r '.tag_name' | sed 's/^v//') # Extract current version from flake.nix CURRENT_VERSION=$(grep -oP 'opencode\.url = "github:anomalyco/opencode/v\K[^"]+' flake.nix) @@ -73,7 +73,7 @@ jobs: echo "🔄 Updating opencode from $CURRENT_VERSION to $LATEST_RELEASE" # Update flake.nix with new version - sed -i 's|opencode\.url = "github:anomalyco/opencode/v.*"|opencode.url = "github:anomalyco/opencode/'"$LATEST_VERSION"'"| flake.nix + sed -i 's|opencode\.url = "github:anomalyco/opencode/v.*"|opencode.url = "github:anomalyco/opencode/v'"$LATEST_RELEASE"'"|' flake.nix # Update flake lock to fetch new revision nix flake update opencode diff --git a/flake.nix b/flake.nix index cd88c11..5d85657 100644 --- a/flake.nix +++ b/flake.nix @@ -44,11 +44,17 @@ overlays = { # Default overlay: adds all custom packages default = final: prev: - import ./pkgs {pkgs = final; inputs = inputs;}; + import ./pkgs { + pkgs = final; + inputs = inputs; + }; # Individual overlays for more granular control additions = final: prev: - import ./pkgs {pkgs = final; inputs = inputs;}; + import ./pkgs { + pkgs = final; + inputs = inputs; + }; modifications = final: prev: import ./overlays/mods {inherit prev;}; diff --git a/pkgs/default.nix b/pkgs/default.nix index 1a5ca18..f92e6b9 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,10 +1,16 @@ -{pkgs, inputs ? null, ...}: let +{ + pkgs, + inputs ? null, + ... +}: let # Upstream opencode v1.1.27 strictly requires Bun 1.3.5 but its locked nixpkgs provides 1.3.6 # We patch package.json to match the environment version to fix the build opencode = inputs.opencode.packages.${pkgs.system}.opencode.overrideAttrs (old: { - postPatch = (old.postPatch or "") + '' - substituteInPlace package.json --replace-fail "bun@1.3.5" "bun@1.3.6" - ''; + postPatch = + (old.postPatch or "") + + '' + substituteInPlace package.json --replace-fail "bun@1.3.5" "bun@1.3.6" + ''; }); in { # Custom packages registry @@ -24,5 +30,5 @@ in { # Imported from flake inputs inherit opencode; - opencode-desktop = inputs.opencode.packages.${pkgs.system}.desktop.override { inherit opencode; }; + opencode-desktop = inputs.opencode.packages.${pkgs.system}.desktop.override {inherit opencode;}; }