Fix nix flake check on macOS
#421
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
9999years
commented
Mar 29, 2024
Comment on lines
+51
to
+53
| (exposed.checks | ||
| // (lib.mapAttrs' (name: value: lib.nameValuePair "stable-${name}" value) | ||
| exposed-stable.checks)); |
There was a problem hiding this comment.
These two sets had the same names, so only the checks from the second set (exposed-stable) were being built. This led to a confusing situation where nix flake check would fail but building the corresponding package with nix build .#opam would succeed.
9999years
commented
Mar 29, 2024
| tools = import ./call-tools.nix pkgs; | ||
| run = pkgs.callPackage ./run.nix { inherit pkgs tools isFlakes gitignore-nix-src; }; | ||
| in | ||
| { | ||
| inherit tools run; | ||
| # Flake style attributes | ||
| packages = tools // { | ||
| packages = (lib.filterAttrs (_name: value: value != null) tools) // { |
There was a problem hiding this comment.
nix flake check complains if non-derivation values are present in packages.
9999years
commented
Mar 29, 2024
| @@ -37,7 +38,10 @@ let | |||
| specialArgs = { inherit pkgs; }; | |||
| }; | |||
| allHooks = config.config.hooks; | |||
| allEntryPoints = pkgs.lib.mapAttrsToList (_: v: v.entry) allHooks; | |||
| allEntryPoints = lib.pipe allHooks [ | |||
| (lib.filterAttrs (_name: value: value.package != null)) | |||
There was a problem hiding this comment.
Can't coerce null to a string.
9999years
commented
Mar 29, 2024
| the-headache = | ||
| (if headache != null then headache else ocamlPackages.headache).overrideAttrs (drv: { | ||
| nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ | ||
| darwin.sigtool |
There was a problem hiding this comment.
Missing codesign on nixpkgs-stable.
9999years
commented
Mar 29, 2024
| @@ -183,6 +174,9 @@ in | |||
| chktex = tex; | |||
| commitizen = commitizen.overrideAttrs (_: _: { doCheck = false; }); | |||
| bats = if bats ? withLibraries then (bats.withLibraries (p: [ p.bats-support p.bats-assert p.bats-file ])) else bats; | |||
| git-annex = if stdenv.isDarwin then null else git-annex; | |||
There was a problem hiding this comment.
Setting these to null is kinda sketchy (meta.broken would be better) but it's what the other derivations in this file do so I left it as-is.
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 fixes
nix flake checkon macOS.