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

Cleanup Nix code #163

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Cleanup Nix code #163

merged 2 commits into from
Nov 29, 2023

Conversation

9999years
Copy link
Member

@9999years 9999years commented Nov 27, 2023

Gives us actual packages, makes the definitions all a bit nicer.

@github-actions github-actions bot added the patch Bug fixes or non-functional changes label Nov 27, 2023
@9999years 9999years force-pushed the rebeccat/nix-cleanup branch 2 times, most recently from dcebedc to 14ff6c8 Compare November 28, 2023 01:27
@9999years 9999years force-pushed the rebeccat/nix-cleanup branch from 14ff6c8 to 52401b6 Compare November 29, 2023 17:48
Copy link
Contributor

@Gabriella439 Gabriella439 left a comment

Choose a reason for hiding this comment

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

looks great! just two things

@@ -0,0 +1,65 @@
{
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there's still the old version of this function in nix/overlays/lib.nix, which you can probably delete now

Copy link
Member Author

Choose a reason for hiding this comment

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

That's in mercury-web-backend!

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, whoops! I didn't notice this was a different repo 😅. Never mind me, then.

flake.nix Outdated
}: let
eachSystem = nixpkgs.lib.genAttrs (import systems);

makeNixpkgs = {
Copy link
Contributor

Choose a reason for hiding this comment

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

Usually for Nix code I reserve the term "nixpkgs" to refer to the Nixpkgs source code and use the term "pkgs" or "packages" to refer to the actual attribute set of packages instantiated from the Nixpkgs source code. So I'd suggest calling this utility makePkgs instead of makeNixpkgs (also because it creates the pkgs variable, so the name would more closely match the result it is used to create).

@9999years 9999years merged commit 96be385 into main Nov 29, 2023
28 checks passed
@9999years 9999years deleted the rebeccat/nix-cleanup branch November 29, 2023 19:24
@9999years 9999years removed the patch Bug fixes or non-functional changes label Nov 29, 2023
Copy link
Contributor

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.

2 participants