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-containers: Add support for custom nixpkgs argument #85570

Merged
merged 1 commit into from Apr 20, 2020
Merged

nixos-containers: Add support for custom nixpkgs argument #85570

merged 1 commit into from Apr 20, 2020

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Apr 19, 2020 •
edited

Motivation

With this change it's possible to use a different version of nixpkgs for your containers than your main system.

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.

@Ma27 Ma27 self-requested a review April 19, 2020 22:31
Ma27
Ma27 reviewed Apr 19, 2020
View reviewed changes
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

Thanks, this seems like a useful addition to me.

Apart from the comments below there are two more things:

  • You should add the VM-test to nixos/tests/all-tests.nix to make sure it's built by Hydra.
  • Would it make sense to add sth. similar to imperative nixos-containers?

nixos/tests/containers-custom-pkgs.nix Show resolved Hide resolved
nixos/modules/virtualisation/containers.nix Show resolved Hide resolved
nixos/modules/virtualisation/containers.nix Show resolved Hide resolved
nixos/tests/containers-custom-pkgs.nix Show resolved Hide resolved
@Ma27 Ma27 added the 6.topic: nixos-container Imperative and declarative systemd-nspawn containers label Apr 19, 2020
@adisbladis
Copy link
Member Author

You should add the VM-test to nixos/tests/all-tests.nix to make sure it's built by Hydra.

👍

Would it make sense to add sth. similar to imperative nixos-containers?

Maybe? I'd rather not touch imperative containers tbh.

@adisbladis
Copy link
Member Author

@GrahamcOfBorg eval

@adisbladis adisbladis merged commit d79c2dd into NixOS:master Apr 20, 2020
@pacien pacien mentioned this pull request May 22, 2020
Closed
This was referenced Sep 24, 2020
Closed
Closed
@erikarvstedt erikarvstedt mentioned this pull request Dec 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 left review comments

@zimbatm zimbatm zimbatm approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: nixos-container Imperative and declarative systemd-nspawn containers 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@adisbladis @zimbatm @Ma27