diff --git a/programs/aider/aider-deriv.nix b/programs/aider/aider-deriv.nix deleted file mode 100644 index 5369648..0000000 --- a/programs/aider/aider-deriv.nix +++ /dev/null @@ -1,204 +0,0 @@ -{ lib, pkgs, ... }: -let - python3 = pkgs.python312.override { - self = python3; - packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; - }; - version = "0.74.1"; - aider-chat = python3.pkgs.buildPythonPackage { - pname = "aider-chat"; - inherit version; - pyproject = true; - - src = pkgs.fetchFromGitHub { - owner = "Aider-AI"; - repo = "aider"; - tag = "v${version}"; - hash = "sha256-JXzkvuSOOEUxNqF6l5USzIPftpnIW+CptEv/0yp0eGM="; - }; - - pythonRelaxDeps = true; - - build-system = with python3.pkgs; [ setuptools-scm ]; - - dependencies = with python3.pkgs; [ - aiohappyeyeballs - aiohttp - aiosignal - annotated-types - anyio - attrs - backoff - beautifulsoup4 - certifi - cffi - charset-normalizer - click - configargparse - diff-match-patch - diskcache - distro - filelock - flake8 - frozenlist - fsspec - gitdb - gitpython - grep-ast - h11 - httpcore - httpx - huggingface-hub - idna - importlib-resources - jinja2 - jiter - json5 - jsonschema - jsonschema-specifications - litellm - markdown-it-py - markupsafe - mccabe - mdurl - multidict - networkx - numpy - openai - packaging - pathspec - pexpect - pillow - prompt-toolkit - psutil - ptyprocess - pycodestyle - pycparser - pydantic - pydantic-core - pydub - pyflakes - pygments - pypandoc - pyperclip - python-dotenv - pyyaml - referencing - regex - requests - rich - rpds-py - scipy - smmap - sniffio - sounddevice - soundfile - soupsieve - tiktoken - tokenizers - tqdm - tree-sitter - tree-sitter-languages - typing-extensions - urllib3 - watchfiles - wcwidth - yarl - zipp - pip - - # Not listed in requirements - mixpanel - monotonic - posthog - propcache - python-dateutil - ]; - - buildInputs = [ pkgs.portaudio ]; - - nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ pkgs.gitMinimal ]; - - disabledTestPaths = [ - # Tests require network access - "tests/scrape/test_scrape.py" - # Expected 'mock' to have been called once - "tests/help/test_help.py" - ]; - - disabledTests = - [ - # Tests require network - "test_urls" - "test_get_commit_message_with_custom_prompt" - # FileNotFoundError - "test_get_commit_message" - # Expected 'launch_gui' to have been called once - "test_browser_flag_imports_streamlit" - # AttributeError - "test_simple_send_with_retries" - # Expected 'check_version' to have been called once - "test_main_exit_calls_version_check" - # AssertionError: assert 2 == 1 - "test_simple_send_non_retryable_error" - ] - ++ lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ - # Tests fails on darwin - "test_dark_mode_sets_code_theme" - "test_default_env_file_sets_automatic_variable" - # FileNotFoundError: [Errno 2] No such file or directory: 'vim' - "test_pipe_editor" - ]; - - makeWrapperArgs = [ - "--set AIDER_CHECK_UPDATE false" - "--set AIDER_ANALYTICS false" - ]; - - preCheck = '' - export HOME=$(mktemp -d) - export AIDER_ANALYTICS="false" - ''; - - optional-dependencies = with python3.pkgs; { - playwright = [ - greenlet - playwright - pyee - typing-extensions - ]; - }; - - passthru = { - withPlaywright = aider-chat.overridePythonAttrs ( - { - dependencies, - buildInputs, - makeWrapperArgs, - ... - }: - { - - dependencies = dependencies ++ aider-chat.optional-dependencies.playwright; - - buildInputs = buildInputs ++ [ pkgs.playwright-driver.browsers ]; - - makeWrapperArgs = makeWrapperArgs ++ [ - "--set PLAYWRIGHT_BROWSERS_PATH ${pkgs.playwright-driver.browsers}" - "--set PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true" - ]; - } - ); - }; - - meta = { - description = "AI pair programming in your terminal"; - homepage = "https://github.com/paul-gauthier/aider"; - changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ happysalada ]; - mainProgram = "aider"; - }; - }; -in -aider-chat diff --git a/programs/aider/default.nix b/programs/aider/default.nix index 89c22c1..7a30917 100644 --- a/programs/aider/default.nix +++ b/programs/aider/default.nix @@ -1,12 +1,11 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: let aiderConfig = builtins.readFile ./aider.yml; - aiderPkgs = import ./aider-deriv.nix { inherit lib pkgs; }; in { - home.packages = [ - aiderPkgs.withPlaywright + home.packages = with pkgs; [ + aider-chat.withPlaywright ]; home.file.".aider.conf.yml".text = aiderConfig; }