Repair the Nix flake #4923
Open
Repair the Nix flake #4923
+60
−37
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
By default, [garnix]() would check all the packages, but only on x86_64-linux. This ensures they’re also checked on aarch64-darwin (the only other platform supported by both this repo and garnix). [The garnix-ci GitHub app](https://github.com/apps/garnix-ci) must also be enabled on this repo for it to run (although for this PR, the results from my fork should be visible).
This does the minimum to get `nix flake check` working.;
The primary issue is that flakes require flat package sets, and this flake
produced nested ones. This flattens the package sets without renaming anything.
E.g., `packages.${system}.docker.ucm` is now `packages.${system}.ucm`, and
similar for other derivations.
The only other change was to correct the attribute name for the UCM docker
image’s command.
This adds some grouping to the outputs, since they can’t be grouped in attribute sets. It also updates the relevant docs with the new names. Here are the renamings: - `packages.haskell-nix.some:cabal:thing`→ `packages.component-some:cabal:thing` - `packages.docker.ucm` → `packages.docker-ucm` - `apps.haskell-nix.some:cabal:thing` → `apps.component-some:cabal:thing`, and - `devShells.haskell-nix.unison-cli` → `devShells.cabal-unison-cli`.
|
I can also remove the garnix config before merging. I mostly have it to make sure I’m getting decent coverage on the Nix bits. But it looks like there’s already some of that in GitHub workflows. |
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.
Overview
This does the minimum to get
nix flake checkworking.The primary issue is that the standard flake outputs require flat package sets, and this flake produced nested ones.
Fixes #4940.
Implementation notes
This merges package sets into a single one rather than making them separate entries in the outputs.
The only other change was to correct the attribute name used for the UCM docker image’s command.
Interesting/controversial decisions
This currently flattens the package sets and adds prefixes to them, for some conceptual groupings. The prefixes could be removed, though.
Also, if we wanted to maintain some of the nesting, we could use the
legacyPackagesoutput, but that is (as it says) legacy, and either way it’s breaking the names, so we might as well just adopt the current flat style.Test coverage
This adds a garnix config to have CI build & test as much as possible from the flake. These checks run on my fork, but garnix would need to be enabled for unisonweb to get it running here.