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

Jump to bottom

nix: fix closure bloat on nix #108069

Merged
merged 1 commit into from Jan 1, 2021
Merged

nix: fix closure bloat on nix #108069

merged 1 commit into from Jan 1, 2021
+9 −4

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Dec 31, 2020

The conditional preventing closure bloat unfortunately didn't apply for
the nix attribute, which is at 2.3.10 (not 2.4.*, what this did check
for).

Motivation for this change

Don't pull in x86 binaries when cross-compiling a whole NixOS.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli
nix: fix closure bloat on nix
3199943 
The conditional preventing closure bloat unfortunately didn't apply for
the `nix` attribute, which is at 2.3.10 (not 2.4.*, what this did check
for).

Due to the somewhat funny 2.4pre* version strings used for nixUnstable
not being understood by lib.versionOlder, we also need to explicitly add
a check for that.
@flokli
Copy link
Contributor Author

flokli commented Dec 31, 2020

Note nixUnstable currently doesn't cross-compile either. There seem to be some issues with the recent markdown additions.

However, I see this orthogonal to that PR.

@ofborg ofborg bot requested a review from edolstra December 31, 2020 19:09
lovesegfault
lovesegfault approved these changes Jan 1, 2021
View reviewed changes
Copy link
Member

@lovesegfault lovesegfault left a comment

Choose a reason for hiding this comment

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

LGTM

@flokli flokli merged commit 4bc3f83 into NixOS:master Jan 1, 2021
@flokli flokli deleted the nix-fix-closurebloat-cross branch January 1, 2021 22:25
flokli added a commit that referenced this pull request Jan 2, 2021
@flokli
nix: remove traceVal
8c657c3 
This slipped through review of
#108069.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovesegfault lovesegfault lovesegfault approved these changes

@grahamc grahamc Awaiting requested review from grahamc

@samueldr samueldr Awaiting requested review from samueldr

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@flokli @lovesegfault