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.

Sign up for GitHub

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

Jump to bottom

Nix improvements #167

Merged
merged 6 commits into from
Mar 19, 2024
Merged

Nix improvements #167

merged 6 commits into from
Mar 19, 2024

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Mar 14, 2024 •
edited
Loading

Various improvements to the Nix code:

  • Use the new lib.fileset library instead of builtins.path and regex based source filtering
  • Fix reduce runtime closure size #143 by always using justStaticExecutables (doesn't mean the binaries are statically linked confusingly)
  • Don't build the haddocks anymore, we won't need those anyways with Deprecate Hackage package #161
  • Remove nixfmt-deriver, doesn't seem necessary
  • Switch to haskellPackages.shellFor, a bit cleaner
  • Add haskell-language-server to the environment, makes development very nice!

@infinisil
Use lib.fileset instead of builtins.path
59c8792
@infinisil
Always just executables and don't build haddock
dfe157e 
- Doesn't inflate closure size to over 2GB, see #143
- The API docs aren't important and we're intending on deprecating the
  hackage package, see #161
@infinisil
Remove nixfmt-deriver
f231cca 
Not needed
@infinisil
Switch to haskellPackages.shellFor
5db3a94 
Probably the same, but feels cleaner
@infinisil
Add hls to the dev environment
ef3ad6b
Base automatically changed from npins to master March 15, 2024 16:40
@infinisil infinisil marked this pull request as ready for review March 15, 2024 20:44
@infinisil infinisil requested a review from a team March 15, 2024 20:46
dasJ
dasJ reviewed Mar 15, 2024
View reviewed changes
.github/workflows/main.yml Outdated
@@ -22,5 +22,5 @@ jobs:
run: nix shell .#packages.x86_64-linux.reuse -c reuse lint

- name: build nixfmt
run: nix build -L .#nixfmt-static
run: nix build -L .
Copy link
Member

Choose a reason for hiding this comment

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

Is this really the correct command when your precious PR was about using stable nix? Iirc the nix command is not stable either

Copy link
Member Author

@infinisil infinisil Mar 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ah good point, I originally avoided this because of the nix shell above because there's no equivalent stable command, but really, it's just nix-build .. && result/bin/reuse lint, changed it now :)

tomberek
tomberek approved these changes Mar 19, 2024
View reviewed changes
Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

from meeting...

@infinisil infinisil merged commit 7f9a820 into master Mar 19, 2024
1 check passed
@infinisil infinisil deleted the nix-refactor branch March 19, 2024 20:01
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/formatting-team-meeting-2024-03-19/41845/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dasJ dasJ dasJ left review comments

@tomberek tomberek tomberek approved these changes

@Sereja313 Sereja313 Sereja313 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

reduce runtime closure size
5 participants
@infinisil @nixos-discourse @tomberek @dasJ @Sereja313