-
-
Notifications
You must be signed in to change notification settings - Fork 189
refactor(nix): split flake.nix using flake-parts #1681
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
Open
jfroche
wants to merge
12
commits into
develop
Choose a base branch
from
chore/nix/split-flake
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,775
−2,304
Conversation
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
This commit introduces a modular Nix flake structure using flake-parts. The monolithic flake.nix has been split into specialized modules. Here is an overview of the new directory structure: ``` ├── flake.nix # Root flake file only referencing modules nix/ ├── apps.nix # Application definitions ├── checks.nix # Build checks and tests ├── config.nix # Global configuration ├── devShells.nix # Development environment shell ├── fmt.nix # Code formatting configuration ├── hooks.nix # Git hooks and pre-commit ├── ext/ # PostgreSQL extensions ├── overlays/ # Nixpkgs overlays ├── packages/ # Custom packages └── postgresql/ # PostgreSQL packages ```
The commit moves the overlay configuration from packages/default.nix to a new dedicated overlays/default.nix file for better organization, while keeping the same functionality. This change improves code structure and maintainability.
Moves postgresql version definitions and default settings into a centralized config.nix module.
Moves postgresql source and debug package generation into the postgresql module. This reduces duplication by generating packages dynamically based on supported versions.
The changes reorganize the groonga-related packages by moving files to a dedicated directory and cleaning up dependencies. It also removes some unused variables and improves package structure.
Adds pre-commit hooks using git-hooks.nix to run treefmt formatting checks before commits.
28ecc0b
to
18db2ac
Compare
Add MkDocs configuration and assets for generating a documentation site. This is more readable and provides a structured way to present information about the project. We don't store the generated site in the repository, but instead use MkDocs to build it on demand. In a development shell, one can run `mkdocs serve` to quickly preview the site locally.
We document the recommended `.envrc` file in the docs, but we forgot to add it to the repository.
mkdocs renders the documentation present in the `nix/docs/` directory in HTML format.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit introduces a modular Nix flake structure using flake-parts.
The monolithic 1,477-line flake.nix has been split into specialized modules, reducing it to just 40 lines.
Here is an overview of the new directory structure:
We create a new namespace configuration
supabase
to centralize the supported postgres versions and the default parameters.Moving to flake parts also help us to introduce formatting using treefmt and pre commit checks.