Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

aider-chat: init at 0.50.0 + python3Packages.pypager: init at 3.0.1 #323927

Merged
merged 2 commits into from
Aug 14, 2024
Merged

aider-chat: init at 0.50.0 + python3Packages.pypager: init at 3.0.1 #323927

merged 2 commits into from
Aug 14, 2024

Conversation

taha-yassine
Copy link
Contributor

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@taha-yassine taha-yassine changed the title aider: init at 0.14.2 aider: init at 0.41.0 Jul 2, 2024
@taha-yassine taha-yassine mentioned this pull request Jul 2, 2024
Closed
12 tasks
eclairevoyant
eclairevoyant reviewed Jul 2, 2024
View reviewed changes
Copy link
Member

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution! Some feedback below; I avoided repeating any feedback, but most of these apply to all the files.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/tools/llm/aider/default.nix Outdated Show resolved Hide resolved
pkgs/tools/llm/aider/default.nix Outdated Show resolved Hide resolved
pkgs/tools/llm/aider/default.nix Outdated Show resolved Hide resolved
pkgs/tools/llm/aider/default.nix Outdated Show resolved Hide resolved
pkgs/tools/llm/aider/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/grep-ast/default.nix Outdated Show resolved Hide resolved
@taha-yassine
Copy link
Contributor Author

Thanks for the feedback! Should be fine now.

@JohnRTitor
Copy link
Contributor

Result of nixpkgs-review pr 323927 run on x86_64-linux 1

4 packages marked as broken and skipped:
  • aider
  • aider.dist
  • python311Packages.grep-ast
  • python311Packages.grep-ast.dist

@KenMacD
Copy link
Contributor

KenMacD commented Aug 1, 2024

A related PR adds grep-ast: #331173

Sigmanificient added a commit to Sigmanificient/nixpkgs that referenced this pull request Aug 3, 2024
@Sigmanificient
aider: init at 0.47.0
72bdac0 
Based on taha-yassine's work (NixOS#323927) but porting a more recent version
of the package.

Features a bunch of changes such as using pyproject, replacing
python3.pkgs with python311Packages (pinned due to treesitting not
supported on python3.12).

Enables testing, with a couple of deselected tests
Sigmanificient added a commit to Sigmanificient/nixpkgs that referenced this pull request Aug 3, 2024
@Sigmanificient
aider: init at 0.47.0
ab0f655 
Based on taha-yassine's work (NixOS#323927) but porting a more recent version
of the package.

Features a bunch of changes such as using pyproject, replacing
python3.pkgs with python311Packages (pinned due to treesitting not
supported on python3.12).

Enables testing, with a couple of deselected tests

Co-Authored-by: Taha Yassine <taha.yssne@gmail.com>
Sigmanificient added a commit to Sigmanificient/nixpkgs that referenced this pull request Aug 3, 2024
@Sigmanificient
aider: init at 0.47.0
a3c1509 
Based on taha-yassine's work (NixOS#323927) but porting a more recent version
of the package.

Features a bunch of changes such as using pyproject, replacing
python3.pkgs with python311Packages (pinned due to treesitting not
supported on python3.12).

Enables testing, with a couple of deselected tests

Co-Authored-by: taha-yassine <taha.yssne@gmail.com>
@Sigmanificient
Copy link
Member

Sigmanificient commented Aug 3, 2024 •
edited
Loading

Hi @taha-yassine, I've ported aider on 0.47.0 (released only a few days ago) in a branch of my nixpkgs fork.

I think it is worth checking out, as it adds a bunch of changes such as using pyproject, replacing
python3.pkgs with python311Packages (pinned due to tree-sitter not supported on python3.12) and other minor changes.

Most importantly, I was able to enables testing, with only a couple of deselected tests.
Feel free to takes this edits to add them here

PS: welcome from a rennais!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/50-packaging-bound-aider/49867/18

@akaihola
Copy link

akaihola commented Aug 3, 2024

tree-sitter not supported on python3.12

@Sigmanificient, I do see Python 3.12 Linux wheels on the tree-sitter 0.12.3 PyPI downloads page – this is the tree-sitter version which Aider 0.47.1 requires.

Sigmanificient added a commit to Sigmanificient/nixpkgs that referenced this pull request Aug 3, 2024
@Sigmanificient
aider: init at 0.47.0
3a8da3e 
Based on taha-yassine's work (NixOS#323927) but porting a more recent version
of the package.

Features a bunch of changes such as using pyproject, replacing
python3.pkgs with python311Packages (pinned due to treesitting not
supported on python3.12).

Enables testing, with a couple of deselected tests

Co-Authored-by: taha-yassine <taha.yssne@gmail.com>
eclairevoyant
eclairevoyant previously requested changes Aug 3, 2024
View reviewed changes
pkgs/development/python-modules/grep-ast/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/grep-ast/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/grep-ast/default.nix Outdated Show resolved Hide resolved
pkgs/by-name/ai/aider/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ai/aider/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ai/aider/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ai/aider/package.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/grep-ast/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/grep-ast/default.nix Outdated Show resolved Hide resolved
pkgs/by-name/ai/aider/package.nix Outdated Show resolved Hide resolved
@eclairevoyant

This comment was marked as resolved.

Sign in to view
@greg-hellings
Copy link
Contributor

My grep-ast package was just merged earlier today. I'm also toiling to get aider build. By now it's at 0.47.1 and requires lox, which my PR for is still pending.

@taha-yassine
Copy link
Contributor Author

@Sigmanificient thanks a lot for your work, it was very helpful :)

@greg-hellings lox is a dev dependency and only needed for running a benchmark upstream, so it isn't needed here imo

PR is ready again for review now that grep-ast has been merged

@Sigmanificient @greg-hellings do you want to be added as maintainers as well?

@eclairevoyant eclairevoyant changed the title aider: init at 0.41.0 aider: init at 0.47.0 Aug 6, 2024
@drupol
Copy link
Contributor

drupol commented Aug 14, 2024

As pointed out by @greg-hellings, since new versions are frequent (this PR started at version 0.41.0), maybe we should prioritize getting this one merged first?

I would prefer to update to the very latest, I'll actively follow the development of this thread tomorrow and merge it if CI is green.

@taha-yassine
Copy link
Contributor Author

As pointed out by @greg-hellings, since new versions are frequent (this PR started at version 0.41.0), maybe we should prioritize getting this one merged first?

I would prefer to update to the very latest, I'll actively follow the development of this thread tomorrow and merge it if CI is green.

In that case should I add pypager as part of this PR or open a new one? Maybe @KenMacD wants to take the initiative?

@drupol
Copy link
Contributor

drupol commented Aug 14, 2024

It can be part of this PR as long as the commit log message is properly formatted (python311Packages.pypager: init at ...).

@taha-yassine
Copy link
Contributor Author

jiter is an indirect dependency added by the latest version of openai. Should we wait for this PR #332797 to get merged or add it as an explicit dependency here?

smantzavinos added a commit to smantzavinos/aider_flake that referenced this pull request Aug 14, 2024
@smantzavinos
Working. Copied code from nixpkgs PR.
cd0431b 
NixOS/nixpkgs#323927
@taha-yassine taha-yassine changed the title aider-chat: init at 0.48.0 aider-chat: init at 0.50.0 + python3Packages.pypager: init at 3.0.1 Aug 14, 2024
@taha-yassine
Copy link
Contributor Author

jiter is an indirect dependency added by the latest version of openai. Should we wait for this PR #332797 to get merged or add it as an explicit dependency here?

Added jiter as a dependency but can remove it if the other PR gets merged in the mean time.

drupol
drupol requested changes Aug 14, 2024
View reviewed changes
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added 2 minor comments.

Make to pass only the new files through nixfmt-rfc-style, ignore if it is already done.

pkgs/development/python-modules/pypager/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pypager/default.nix Outdated Show resolved Hide resolved
@drupol
Copy link
Contributor

drupol commented Aug 14, 2024 

   error: evaluation aborted with the following error message: 'lib.customisation.callPackageWith: Function called without required argument "prompt_toolkit" at /ofborg/checkout/2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-1/pkgs/development/python-modules/pypager/default.nix:6, did you mean "prompt-toolkit"?'

@drupol drupol merged commit fcfa553 into NixOS:master Aug 14, 2024
25 of 27 checks passed
@viraptor
Copy link
Contributor

Well done @taha-yassine - this was a lot more work than a new package usually requires. Great job sticking around to polish it / deal with all the requests. ❤️

This was referenced Aug 15, 2024
Closed
Closed
@taha-yassine
Copy link
Contributor Author

Well done @taha-yassine - this was a lot more work than a new package usually requires. Great job sticking around to polish it / deal with all the requests. ❤️

I was merely the one who started the PR. I wouldn't have made it this far without the help of everyone that was involved. Thanks everyone! 😊

@taha-yassine taha-yassine deleted the aider branch August 15, 2024 16:17
mjrusso added a commit to mjrusso/nixos-config that referenced this pull request Aug 20, 2024
@mjrusso
Install Aider.
99bab7f 
With thanks to:

- NixOS/nixpkgs#323927
- paul-gauthier/aider#544
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@viraptor viraptor viraptor left review comments

@greg-hellings greg-hellings greg-hellings left review comments

@eclairevoyant eclairevoyant eclairevoyant left review comments

@natsukium natsukium natsukium left review comments

@JohnRTitor JohnRTitor JohnRTitor left review comments

@drupol drupol drupol approved these changes

Assignees
No one assigned
Labels
6.topic: python 8.has: maintainer-list (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.