-
Notifications
You must be signed in to change notification settings - Fork 81
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.
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
Devenv update #1130
Devenv update #1130
Conversation
@kissgyorgy can you have a look at this ? Need a review from someone stronger in Nix :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks nice, I have comments for the implementation of the external library, but that won't affect these changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, tried it out, but .devenv/state/venv/lib/python3.12/site-packages/devenv.pth
points to a nix store path which can't be written.
It also fails to build lz4 for some reason on uv sync.
It was left over from the previous implementation on the fork I am switching over. Should be deleted. Also bumped the lock file to fix typeos in implementation. It will also use a different file name so it won't clash with this stale link. |
7f60fad
to
cc14e0d
Compare
I also have an upstream PR/discussion cachix/devenv#1562 |
I cannot reproduce it. LZ4 should be coming from wheel, for some reason it thinks it is not compatible with your platform. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything is working now
Shove away reworked compatibility hacks in https://github.com/vlaci/devenv-extras
Flake lock file updates: • Updated input 'devenv': 'github:vlaci/devenv/4caf75b37c5d633fde612cd52bb794bcbf75d24a' (2024-11-12) → 'github:cachix/devenv/27276816caa1718f8b8e8d53d64cc18da059e101' (2025-02-12) • Updated input 'devenv/cachix': 'github:cachix/cachix/695525f9086542dfb09fde0871dbf4174abbf634' (2024-09-16) → 'github:cachix/cachix/f65a3cd5e339c223471e64c051434616e18cc4f5' (2025-01-23) • Updated input 'devenv/cachix/devenv': 'github:cachix/devenv/ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91' (2024-08-08) → follows 'devenv' • Removed input 'devenv/cachix/devenv/cachix' • Removed input 'devenv/cachix/devenv/cachix/devenv' • Removed input 'devenv/cachix/devenv/cachix/devenv/flake-compat' • Removed input 'devenv/cachix/devenv/cachix/devenv/nix' • Removed input 'devenv/cachix/devenv/cachix/devenv/nix/flake-compat' • Removed input 'devenv/cachix/devenv/cachix/devenv/nix/nixpkgs' • Removed input 'devenv/cachix/devenv/cachix/devenv/nix/nixpkgs-regression' • Removed input 'devenv/cachix/devenv/cachix/devenv/nixpkgs' • Removed input 'devenv/cachix/devenv/cachix/devenv/poetry2nix' • Removed input 'devenv/cachix/devenv/cachix/devenv/poetry2nix/flake-utils' • Removed input 'devenv/cachix/devenv/cachix/devenv/poetry2nix/flake-utils/systems' • Removed input 'devenv/cachix/devenv/cachix/devenv/poetry2nix/nix-github-actions' • Removed input 'devenv/cachix/devenv/cachix/devenv/poetry2nix/nix-github-actions/nixpkgs' • Removed input 'devenv/cachix/devenv/cachix/devenv/poetry2nix/nixpkgs' • Removed input 'devenv/cachix/devenv/cachix/devenv/pre-commit-hooks' • Removed input 'devenv/cachix/devenv/cachix/flake-compat' • Removed input 'devenv/cachix/devenv/cachix/nixpkgs' • Removed input 'devenv/cachix/devenv/cachix/pre-commit-hooks' • Removed input 'devenv/cachix/devenv/flake-compat' • Removed input 'devenv/cachix/devenv/nix' • Removed input 'devenv/cachix/devenv/nix/flake-compat' • Removed input 'devenv/cachix/devenv/nix/nixpkgs' • Removed input 'devenv/cachix/devenv/nix/nixpkgs-regression' • Removed input 'devenv/cachix/devenv/nixpkgs' • Removed input 'devenv/cachix/devenv/pre-commit-hooks' • Updated input 'devenv/cachix/flake-compat': follows 'devenv/flake-compat' → follows 'devenv' • Updated input 'devenv/cachix/git-hooks': follows 'devenv/pre-commit-hooks' → follows 'devenv' • Updated input 'devenv/cachix/nixpkgs': follows 'devenv/nixpkgs' → 'github:NixOS/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a' (2025-02-10) • Added input 'devenv/git-hooks': 'github:cachix/git-hooks.nix/9364dc02281ce2d37a1f55b6e51f7c0f65a75f17' (2025-01-21) • Added input 'devenv/git-hooks/flake-compat': follows 'devenv' • Added input 'devenv/git-hooks/gitignore': 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28) • Added input 'devenv/git-hooks/gitignore/nixpkgs': follows 'devenv/git-hooks/nixpkgs' • Added input 'devenv/git-hooks/nixpkgs': follows 'devenv/nixpkgs' • Updated input 'devenv/nix/flake-compat': follows 'devenv/flake-compat' → follows 'devenv' • Updated input 'devenv/nix/nixpkgs-23-11': 'github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446' (2024-05-31) → follows 'devenv' • Updated input 'devenv/nix/nixpkgs-regression': 'github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2' (2022-01-24) → follows 'devenv' • Updated input 'devenv/nix/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12) → follows 'devenv' • Removed input 'devenv/nix/pre-commit-hooks/flake-compat' • Removed input 'devenv/nix/pre-commit-hooks/flake-utils' • Removed input 'devenv/nix/pre-commit-hooks/gitignore' • Removed input 'devenv/nix/pre-commit-hooks/nixpkgs' • Removed input 'devenv/nix/pre-commit-hooks/nixpkgs-stable' • Removed input 'devenv/pre-commit-hooks' • Removed input 'devenv/pre-commit-hooks/flake-compat' • Removed input 'devenv/pre-commit-hooks/gitignore' • Removed input 'devenv/pre-commit-hooks/gitignore/nixpkgs' • Removed input 'devenv/pre-commit-hooks/nixpkgs' • Removed input 'devenv/pre-commit-hooks/nixpkgs-stable' • Added input 'devenv-extras': 'github:vlaci/devenv-extras/0cd66ae6f20f9ba0a9b169df5052efaf8e13083c' (2025-02-12)
9237a47
to
8f1f70e
Compare
Figured out a way to switch to upstream devenv version. Also, I've split out the compatibility
hacksimprovements to a separate repo reusable across projects.Flake dependencies are simplified a lot, as the circular cachix <-> devenv dependencies have been solved upstream: