feat(nix): improve flake.nix, follows nixpkgs #1246
Merged
Conversation
This file contains 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
hmenke
approved these changes
Feb 21, 2024
|
Added some comments to direct people to contribute to nixpkgs for the package definition, and rebased. |
Also, use updated flake outputs instead of the deprecated ones:
- `packages.${system}.default` instead of `defaultPackage`
- `overlays.default` instead of `overlay`.
See: https://nixos.org/manual/nix/unstable/release-notes/rl-2.7.html
Reuse nixpkgs definition for git-branchless, and supply local changes through overrides. This ensures that nixpkgs updates are automatically propagated to the package definition here. In flake.nix we recommend people to contribute to nixpkgs first for it to be the primary source of package definition; and then pull the changes down here by updating flake.lock.
Since the package definition for scm-diff-editor is almost identical to git-branchless, we reuse the code to avoid duplication and improve coherence.
This includes upstream updates for git-branchless to install the man pages.
bryango
force-pushed
the
nix-flake-updates
branch
from
ef03c4c
to
f036353
Compare
|
I can't read Nix so I'll just trust @hmenke and CI 😇 |
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 patch tries to improve the flake.nix file and brings in nixpkgs updates. The changes may seem overwhelming at first, but they are organized into the following commits, each can be easily reviewed and approved (or rejected):
packages.${system}.defaultinstead ofdefaultPackageoverlays.defaultinstead ofoverlay.Pinging @thoughtpolice and @hmenke if they are interested in a review!