From f4b66744ad213e18e752d63429830027b5b3aef9 Mon Sep 17 00:00:00 2001 From: Luis Eduardo Bueso de Barrio Date: Wed, 3 Jun 2026 23:54:11 +0200 Subject: [PATCH] fixes --- .gitea/workflows/ci.yml | 67 ++++--------------- flake.lock | 40 +----------- flake.nix | 79 ++++++++++++----------- packages/annas-mcp/package.nix | 29 +++++++++ packages/default.nix | 2 +- packages/nextcloud-mcp-server/package.nix | 1 + packages/rust-research-mcp/package.nix | 50 -------------- 7 files changed, 90 insertions(+), 178 deletions(-) create mode 100644 packages/annas-mcp/package.nix delete mode 100644 packages/rust-research-mcp/package.nix diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index cfa869b..bfd4c47 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -1,63 +1,22 @@ -name: CI +name: NixOS Configuration CI on: push: - branches: [ main, master ] + branches: + - main + - master pull_request: - branches: [ main, master ] + branches: + - main + - master jobs: - flake-check: - name: Flake Check - runs-on: ubuntu-latest + check: + name: Nix Flake Check + runs-on: nixos steps: - - name: Checkout code + - name: Checkout Repository uses: actions/checkout@v4 - - name: Install Nix - uses: https://github.com/cachix/install-nix-action@v26 - with: - extra_nix_config: | - experimental-features = nix-command flakes - accept-flake-config = true - - - name: Validate flake - run: nix flake check --print-build-logs - - build-individual: - name: Build Individual Packages - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - package: - - academic-search-mcp-server - - duckduckgo-mcp-server - - kindly-web-search-mcp-server - - manim-mcp-server - - pdf-reader-mcp - - rust-research-mcp - - zotero-mcp - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Install Nix - uses: https://github.com/cachix/install-nix-action@v26 - with: - extra_nix_config: | - experimental-features = nix-command flakes - accept-flake-config = true - - - name: Build ${{ matrix.package }} - run: nix build .#${{ matrix.package }} --print-build-logs - - - name: Test executable exists - run: | - if [ -e "./result/bin/${{ matrix.package }}" ]; then - echo "✓ Executable found: ${{ matrix.package }}" - ./result/bin/${{ matrix.package }} --help || true - else - echo "⚠ No executable found at ./result/bin/${{ matrix.package }}" - ls -la ./result/bin/ || echo "No bin directory" - fi + - name: Run nix flake check + run: nix flake check --show-trace diff --git a/flake.lock b/flake.lock index 55ce8f3..bffd844 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,12 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1770181073, - "narHash": "sha256-ksTL7P9QC1WfZasNlaAdLOzqD8x5EPyods69YBqxSfk=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf922a59c5c9998a6584645f7d0de689512e444c", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -36,24 +18,8 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9ca4418..d1a3b1d 100644 --- a/flake.nix +++ b/flake.nix @@ -12,52 +12,59 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; }; outputs = + { self, nixpkgs, ... }: + let + supportedSystems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + in { - self, - nixpkgs, - flake-utils, - ... - }: - { - # Overlay that adds all MCP packages to nixpkgs overlays.default = import ./overlays/default.nix; } - // flake-utils.lib.eachDefaultSystem ( - system: - let - pkgs = import nixpkgs { - inherit system; - overlays = [ self.overlays.default ]; - }; - - # Import all MCP packages - mcpPackages = import ./packages { inherit pkgs; }; - - # List of all MCP server packages (for devShell) - allMcpServers = builtins.attrValues mcpPackages ++ [ pkgs.mcp-nixos ]; - in - { - # Export all packages - packages = mcpPackages // { + // { + packages = forAllSystems ( + system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ self.overlays.default ]; + }; + mcpPackages = import ./packages { inherit pkgs; }; + in + mcpPackages // { default = pkgs.symlinkJoin { name = "mcp-servers"; paths = builtins.attrValues mcpPackages; }; - }; + } + ); - devShells.default = pkgs.mkShell { - packages = allMcpServers ++ [ - pkgs.git - ]; + devShells = forAllSystems ( + system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ self.overlays.default ]; + }; + mcpPackages = import ./packages { inherit pkgs; }; + in + { + default = pkgs.mkShell { + packages = builtins.attrValues mcpPackages ++ [ pkgs.mcp-nixos pkgs.git ]; + shellHook = '' + export SEARXNG_BASE_URL="https://search.bueso.eu" + ''; + }; + } + ); - shellHook = '' - export SEARXNG_BASE_URL="https://search.bueso.eu" - ''; - }; - } - ); + checks.x86_64-linux = builtins.removeAttrs self.packages.x86_64-linux [ "default" ]; + }; } diff --git a/packages/annas-mcp/package.nix b/packages/annas-mcp/package.nix new file mode 100644 index 0000000..27ca213 --- /dev/null +++ b/packages/annas-mcp/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "annas-mcp"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "iosifache"; + repo = "annas-mcp"; + rev = "v${version}"; + hash = "sha256-XicM7tU5jD8B8n7JJDQ/84koBiLb8XF4+WBQ4LCUoRU="; + }; + + vendorHash = "sha256-2NdG5p2XfrhVgi388dRDBUSGwg6ybnzfn9495TWNGsA="; + + subPackages = [ "cmd/annas-mcp" ]; + + meta = with lib; { + description = "MCP server and CLI for searching and downloading documents from Anna's Archive"; + homepage = "https://github.com/iosifache/annas-mcp"; + license = licenses.mit; + mainProgram = "annas-mcp"; + platforms = platforms.all; + }; +} diff --git a/packages/default.nix b/packages/default.nix index 5b87f22..231e707 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -16,7 +16,6 @@ zotero-mcp = pkgs.callPackage ./zotero-mcp/package.nix { }; pdf-reader-mcp = pkgs.callPackage ./pdf-reader-mcp/package.nix { }; kindly-web-search-mcp-server = pkgs.callPackage ./kindly-web-search-mcp-server/package.nix { }; - rust-research-mcp = pkgs.callPackage ./rust-research-mcp/package.nix { }; duckduckgo-mcp-server = pkgs.callPackage ./duckduckgo-mcp-server/package.nix { }; n8n-mcp = pkgs.callPackage ./n8n-mcp/package.nix { }; simple-web-search-mcp = pkgs.callPackage ./simple-web-search-mcp/package.nix { }; @@ -25,5 +24,6 @@ sabnzbd-mcp = pkgs.callPackage ./sabnzbd-mcp/package.nix { }; jellyfin-mcp = pkgs.callPackage ./jellyfin-mcp/package.nix { }; nextcloud-mcp-server = pkgs.callPackage ./nextcloud-mcp-server/package.nix { }; + annas-mcp = pkgs.callPackage ./annas-mcp/package.nix { }; # example-mcp-server = pkgs.callPackage ./example-mcp-server/package.nix { }; } diff --git a/packages/nextcloud-mcp-server/package.nix b/packages/nextcloud-mcp-server/package.nix index 73e551c..78e8c94 100644 --- a/packages/nextcloud-mcp-server/package.nix +++ b/packages/nextcloud-mcp-server/package.nix @@ -20,6 +20,7 @@ let }; inherit propagatedBuildInputs; doCheck = false; + dontCheckRuntimeDeps = true; inherit meta; }; diff --git a/packages/rust-research-mcp/package.nix b/packages/rust-research-mcp/package.nix deleted file mode 100644 index 4f49ff9..0000000 --- a/packages/rust-research-mcp/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - openssl, -}: - -rustPlatform.buildRustPackage rec { - pname = "rust-research-mcp"; - version = "0.6.7-unstable"; - - src = fetchFromGitHub { - owner = "Ladvien"; - repo = "research_hub_mcp"; - rev = "3335c118da9e7a9e9e7f2e608989fbe35557f3c5"; - hash = "sha256-KkIVeFQ8hEL82ZtC+Tie+8T/eZcEoWyq5cRVgdinQEc="; - }; - - cargoHash = "sha256-zwhQ2ksFbedeuzTaJI+9t9of6es7RJa6JwRHQRznqBY="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ]; - - doCheck = false; - - # The build.rs uses vergen to embed git info, which fails without a git repo. - # Set environment variables to satisfy vergen during build. - env = { - VERGEN_GIT_BRANCH = "main"; - VERGEN_GIT_COMMIT_DATE = "2025-09-25"; - VERGEN_GIT_COMMIT_TIMESTAMP = "2025-09-25T19:35:10Z"; - VERGEN_GIT_SHA = "3335c118da9e7a9e9e7f2e608989fbe35557f3c5"; - VERGEN_BUILD_DATE = "2025-09-25"; - VERGEN_BUILD_TIMESTAMP = "2025-09-25T19:35:10Z"; - }; - - meta = with lib; { - description = "MCP server for accumulating and organizing academic knowledge"; - homepage = "https://github.com/Ladvien/research_hub_mcp"; - license = licenses.gpl3Only; - mainProgram = pname; - platforms = platforms.all; - }; -}