Skip to content
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

make nixos module hydra from this repository by default #1419

Merged
merged 2 commits into from
Oct 20, 2024
Merged

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Oct 19, 2024

When people reach out to the git repository they probably want to use hydra from the same source.
This also removes the need for an overlay with simpler and more performant direct use of the nixpkgs passed in. Before it was re-importing nixpkgs.

@Mic92 Mic92 marked this pull request as draft October 19, 2024 16:05
When people reach out to the git repository they probably want to use
hydra from the same source.
This also removes the need for an overlay with simpler and more
performant direct use of the nixpkgs passed in. Before it was
re-importing nixpkgs.

test
@Mic92 Mic92 marked this pull request as ready for review October 19, 2024 16:52
@Mic92
Copy link
Member Author

Mic92 commented Oct 19, 2024

cc @Mindavi for review

Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a good improvement and I don't see any obvious mistakes. I'm personally not using the flake though.

@Mic92 Mic92 merged commit d3966d3 into master Oct 20, 2024
2 checks passed
@Mic92 Mic92 deleted the refactor-flake branch October 20, 2024 13:06
@Ericson2314
Copy link
Member

Note I was trying to make fewer things depend on the flake before / not potentially mix Nixpkgs downstream by default. But this is fine.

I realized one of the things I put in nixos-tests is not a NixOS test; that is moved out maybe that file doesn't need nixpkgs.legacyPackages anymore.

@Mic92
Copy link
Member Author

Mic92 commented Oct 20, 2024

People that used the nixos module instead of the flake now have to explicitly have to set the hydra package. I believe this is less error-prone interface than assuming they imported the overlay correctly.

Comment on lines +70 to +75
hydra = nixpkgs.legacyPackages.${system}.callPackage ./package.nix {
inherit (nixpkgs.lib) fileset;
rawSrc = self;
nix = nix.packages.${system}.nix;
nix-perl-bindings = nix.hydraJobs.perlBindings.${system};
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The duplicating of the overlay also tripped me up, forgot to add nix-eval-jobs in both places.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants