Do some clean up of the Nix infrastructure#22
Merged
OpsBotPrime merged 9 commits intomasterfrom Nov 11, 2025
Merged
Conversation
Everything in there ultimately relies on Channable-internal tooling, and is only needed if we want to run pre-commit in a separate environment. For this repo it's okay to just put pre-commit and tools we want to run through it in the same `mkShell`.
No way that'll actually be kept up to date.
Qqwy
reviewed
Nov 11, 2025
| watch_file nix/sources.json nix/sources.nix nix/overlay.nix nix/python-overlay.nix opsqueue/opsqueue.nix /libs/opsqueue_python/opsqueue_python.nix | ||
| fi | ||
|
|
||
| watch_file ./nix/ ./**/*.nix |
Qqwy
approved these changes
Nov 11, 2025
Contributor
Qqwy
left a comment
Qqwy
left a comment
There was a problem hiding this comment.
Thank you very much for making this nicer! ❤️
Contributor
Author
|
@OpsBotPrime merge |
Contributor
|
Rebased as 1f3cde6, waiting for CI … |
OpsBotPrime
added a commit
that referenced
this pull request
Nov 11, 2025
Approved-by: isomorpheme Priority: Normal Auto-deploy: false
Contributor
|
CI job 🟡 started. |
Contributor
|
The build failed ❌. If this is the result of a flaky test, then tag me again with the |
Contributor
Author
|
@OpsBotPrime retry |
Approved-by: isomorpheme Priority: Normal Auto-deploy: false
Contributor
|
Rebased as c943a54, waiting for CI … |
Contributor
|
CI job 🟡 started. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As title, and commit history should explain the individual changes.
Importantly, this fixes an oversight where the Python overlay can't be used without also using the general nixpkgs overlay, since the former depends on the
fileFilterutility function added by the latter. Since that's purely Nix code, we simply shouldn't define that in an overlay - then it's also much easier to see wherefileFilteris even defined.I also plan to do a future PR to remove some more Channable workflow-specific bits, and to make the project easier to import into other Nix code.