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

nixos/nix-optimise: be smarter about when we run the store optimiser #69387

Merged
merged 1 commit into from Sep 26, 2019
Merged

nixos/nix-optimise: be smarter about when we run the store optimiser #69387

merged 1 commit into from Sep 26, 2019

Conversation

peterhoeg
Copy link
Member

We might be inside a NixOS container on a non-NixOS host, so instead of not
running at all inside a container, check if the nix-daemon socket is writable as
it will tell us if the store is managed from here or outside.

Fixes #63578

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @rhendric

@peterhoeg
nixos/nix-optimise: be smarter about when we run the store optimiser
897834f 
We might be inside a NixOS container on a non-NixOS host, so instead of not
running at all inside a container, check if the nix-daemon socket is writable as
it will tell us if the store is managed from here or outside.

Fixes NixOS#63578
rhendric
rhendric approved these changes Sep 25, 2019
View reviewed changes
Copy link
Member

@rhendric rhendric left a comment

Choose a reason for hiding this comment

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

LGTM!

@peterhoeg peterhoeg merged commit 8cc9d24 into NixOS:master Sep 26, 2019
@peterhoeg peterhoeg deleted the f/optimise branch September 26, 2019 05:10
@peterhoeg peterhoeg restored the f/optimise branch September 26, 2019 13:17
@peterhoeg peterhoeg deleted the f/optimise branch September 26, 2019 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rhendric rhendric rhendric approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

nix-optimise doesn't run in a container of *any* host
2 participants
@peterhoeg @rhendric