From 4bf6faa2a741603010d8e1fc220ab7294d860e00 Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Tue, 16 Jun 2026 21:41:30 +0300 Subject: [PATCH] chore: remove goose-cli package and cleanup configuration - Delete packages/goose-cli/ (librusty_v8 pre-built binary dependency) - Remove global nixpkgs.config.allowUnfree from flake.nix (goose-cli was the only package requiring unfree binaries) - Add .claude/ to .gitignore - Update README.md and AGENTS.md to remove all goose-cli references --- .gitignore | 1 + AGENTS.md | 11 +--- README.md | 8 +-- flake.nix | 3 - packages/goose-cli/default.nix | 9 --- packages/goose-cli/fetchers.nix | 21 ------- packages/goose-cli/librusty_v8.nix | 13 ----- packages/goose-cli/package.nix | 94 ------------------------------ packages/goose-cli/update.py | 26 --------- 9 files changed, 6 insertions(+), 180 deletions(-) delete mode 100644 packages/goose-cli/default.nix delete mode 100644 packages/goose-cli/fetchers.nix delete mode 100644 packages/goose-cli/librusty_v8.nix delete mode 100644 packages/goose-cli/package.nix delete mode 100644 packages/goose-cli/update.py diff --git a/.gitignore b/.gitignore index 7f53008..faed312 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .qoder .qwen +.claude/ result result-* .direnv/ diff --git a/AGENTS.md b/AGENTS.md index 6f4ee40..9be84af 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -87,13 +87,7 @@ nix-overlay/ ├── packages/ │ ├── default/ # Meta-package listing all visible packages │ │ ├── default.nix -│ │ └── package.nix -│ ├── goose-cli/ # Example package: Goose AI agent CLI -│ │ ├── default.nix -│ │ ├── package.nix # Main package definition -│ │ ├── fetchers.nix # Custom fetchers (if needed) -│ │ ├── librusty_v8.nix # V8 library pre-built binary -│ │ └── update.py # Update script for version bumps +│ │ └── package.nix │ └── flake-inputs/ # Utility to cache all flake inputs │ └── default.nix ├── README.md # User-facing documentation @@ -232,7 +226,7 @@ When adding a new package: ```bash # Build specific package -nix build .#goose-cli +nix build .#mcp-gateway # Build all packages for current system nix build .#packages @@ -319,7 +313,6 @@ nix build .# ### Package-Specific Notes -- **goose-cli**: Also updates `librusty_v8` hashes automatically via the custom fetcher - **mcp-gateway**: Standard Rust package, `nix-update` handles version + cargoHash - **skillsmcp**: Pinned to a commit hash; use `--version=branch=main` or specify the target commit with `--commit` diff --git a/README.md b/README.md index 6dce51e..0436ea1 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ A custom Nix overlay and flake providing additional packages not found in upstre | `container-use` | Containerized environments for coding agents | AI Coding Agents | | `desloppify` | Multi-language codebase health scanner and technical debt tracker for AI agents | AI Coding Agents | | `freebuff` | The world's strongest free coding agent | AI Coding Agents | -| `goose-cli` | CLI for Goose - a local, extensible, open source AI agent that automates engineering tasks | AI Coding Agents | | `graphify` | Turn any folder of code, docs, papers, images, or videos into a queryable knowledge graph | AI Coding Agents | | `hipengine` | ROCm-native local LLM inference engine with torch-free runtime for AMD RDNA GPUs | AI Inference | | `mcp-gateway` | Universal Model Context Protocol gateway that sits between AI client and MCP tools/servers | MCP Servers | @@ -74,10 +73,10 @@ With flakes enabled: ```bash # Try a package -nix run git+https://git.millerson.name/alex/millerson-overlay.nix.git#goose-cli +nix run git+https://git.millerson.name/alex/millerson-overlay.nix.git#mcp-gateway # Install permanently -nix profile install git+https://git.millerson.name/alex/millerson-overlay.nix.git#goose-cli +nix profile install git+https://git.millerson.name/alex/millerson-overlay.nix.git#mcp-gateway ``` ## Development @@ -94,7 +93,7 @@ nix profile install git+https://git.millerson.name/alex/millerson-overlay.nix.gi nix build .#packages # Build specific package -nix build .#goose-cli +nix build .#mcp-gateway # Enter development shell nix develop @@ -116,7 +115,6 @@ nix-overlay/ │ ├── desloppify/ # Codebase health scanner for AI agents │ ├── flake-inputs/ # Utility for caching flake inputs │ ├── freebuff/ # Free coding agent (Codebuff) -│ ├── goose-cli/ # Goose AI agent CLI │ ├── graphify/ # Knowledge graph generator for code folders │ ├── hipengine/ # ROCm-native LLM inference engine for AMD GPUs │ ├── kubernetes-mcp-server/ # MCP server for Kubernetes and OpenShift diff --git a/flake.nix b/flake.nix index 3120b4d..9cce467 100644 --- a/flake.nix +++ b/flake.nix @@ -33,9 +33,6 @@ let blueprintOutputs = inputs.blueprint { inherit inputs; - # allowUnfree is needed for packages that depend on pre-built - # binaries (e.g., goose-cli's librusty_v8) - nixpkgs.config.allowUnfree = true; }; in blueprintOutputs diff --git a/packages/goose-cli/default.nix b/packages/goose-cli/default.nix deleted file mode 100644 index 550923f..0000000 --- a/packages/goose-cli/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - pkgs, - ... -}: -pkgs.callPackage ./package.nix { - librusty_v8 = pkgs.callPackage ./librusty_v8.nix { - inherit (pkgs.callPackage ./fetchers.nix { }) fetchLibrustyV8; - }; -} diff --git a/packages/goose-cli/fetchers.nix b/packages/goose-cli/fetchers.nix deleted file mode 100644 index 92a456f..0000000 --- a/packages/goose-cli/fetchers.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Fetchers for goose-cli pre-built dependencies -# Based on deno's approach for handling rusty_v8 -{ - lib, - stdenv, - fetchurl, -}: - -{ - fetchLibrustyV8 = - args: - fetchurl { - name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - hash = args.shas.${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -} diff --git a/packages/goose-cli/librusty_v8.nix b/packages/goose-cli/librusty_v8.nix deleted file mode 100644 index be5e4ce..0000000 --- a/packages/goose-cli/librusty_v8.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Pre-built librusty_v8 library for goose-cli -# This file specifies the rusty_v8 version and hashes for all supported platforms -{ fetchLibrustyV8 }: - -fetchLibrustyV8 { - version = "145.0.0"; - shas = { - x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE="; - aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY="; - x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho="; - aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k="; - }; -} diff --git a/packages/goose-cli/package.nix b/packages/goose-cli/package.nix deleted file mode 100644 index 4063ba4..0000000 --- a/packages/goose-cli/package.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - pkg-config, - cmake, - cacert, - openssl, - libxcb, - dbus, - versionCheckHook, - librusty_v8, - llvmPackages, -}: - -rustPlatform.buildRustPackage rec { - pname = "goose-cli"; - version = "1.33.1"; - - src = fetchFromGitHub { - owner = "block"; - repo = "goose"; - rev = "v${version}"; - hash = "sha256-FBICGOfVs2jbOdLWSInqfTYBdnCcbcGWHwqY/b6v8eg="; - }; - - cargoHash = "sha256-fN0FKDYFkZrQQPWdUlemOaGzIAZhqFyskz9TEmG+X4o="; - - nativeBuildInputs = [ - pkg-config - cmake - llvmPackages.libclang - ]; - - buildInputs = [ - openssl - libxcb - dbus - ]; - - # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem - # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - env.RUSTY_V8_ARCHIVE = librusty_v8; - - # bindgen (used by llama-cpp-sys-2) needs libclang and C headers - env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - env.BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${lib.getDev stdenv.cc.libc}/include"; - - # reqwest needs CA certificates in the sandbox - env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - # Build only the CLI package - cargoBuildFlags = [ - "--package" - "goose-cli" - ]; - - # Enable tests with proper environment - doCheck = true; - checkPhase = '' - export HOME=$(mktemp -d) - export XDG_CONFIG_HOME=$HOME/.config - export XDG_DATA_HOME=$HOME/.local/share - export XDG_STATE_HOME=$HOME/.local/state - export XDG_CACHE_HOME=$HOME/.cache - mkdir -p $XDG_CONFIG_HOME $XDG_DATA_HOME $XDG_STATE_HOME $XDG_CACHE_HOME - - # Run tests for goose-cli package only - cargo test --package goose-cli - ''; - - doInstallCheck = true; - nativeInstallCheckInputs = [ versionCheckHook ]; - - passthru = { - category = "AI Coding Agents"; - updateScript = [ - "nix-update" - "--flake" - ".#goose-cli" - ]; - }; - - meta = { - description = "CLI for Goose - a local, extensible, open source AI agent that automates engineering tasks"; - homepage = "https://github.com/block/goose"; - changelog = "https://github.com/block/goose/releases/tag/v${version}"; - license = lib.licenses.asl20; - sourceProvenance = with lib.sourceTypes; [ fromSource ]; - mainProgram = "goose"; - platforms = lib.platforms.all; - }; -} diff --git a/packages/goose-cli/update.py b/packages/goose-cli/update.py deleted file mode 100644 index 3490539..0000000 --- a/packages/goose-cli/update.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python3 -p python3 nix-update - -""" -Update script for goose-cli package. - -This script uses nix-update to fetch the latest version of goose-cli -and update the package.nix file with the new version, src hash, and cargoHash. -It also updates the librusty_v8 hashes via the custom fetchers.nix. - -Usage: - ./update.py # Update to latest release - ./update.py --version 1.34.0 # Update to specific version -""" - -import subprocess -import sys - - -def main(): - args = ["nix-update", "--flake", ".#goose-cli"] + sys.argv[1:] - subprocess.check_call(args) - - -if __name__ == "__main__": - main()