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

make-disk-image: replace nixos-install by nix-env calls #70027

Merged
merged 1 commit into from
Oct 7, 2019
Merged

make-disk-image: replace nixos-install by nix-env calls #70027

merged 1 commit into from
Oct 7, 2019
+11 −3

Conversation

ck3d
Copy link
Contributor

@ck3d ck3d commented Sep 29, 2019

nixos-install can only be called from a machine

Motivation for this change

fixes ova build error, which was introduced with PR #67232 .

Things done

I build ova successfully with following call:

nix-build ./nixos/release.nix -A ova.x86_64-linux
  • 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 @vcunat @fpletz @markuskowa

Sorry, something went wrong.

@ckesg
make-disk-image: replace nixos-install by nix-env calls

Verified

This commit was signed with the committer’s verified signature.
magbak Magnus Bakken
GPG key ID: F7FA2BC3703C0729
Verified
Learn about vigilant mode
e9bf955 
nixos-install can only be called from a machine
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 29, 2019
@worldofpeace worldofpeace added the 1.severity: blocker This is preventing another PR or issue from being completed label Oct 1, 2019
@arcnmx arcnmx mentioned this pull request Oct 4, 2019
Merged
10 tasks
@worldofpeace worldofpeace mentioned this pull request Oct 5, 2019
Closed
@markuskowa markuskowa self-assigned this Oct 6, 2019
@markuskowa
Copy link
Member

markuskowa commented Oct 6, 2019 •
edited
Loading

The ova is working again. Also the following tests pass:

  • nixosTests.virtualbox
  • amazonImage.x86_64-linux (release.nix)
    However, nixosTests.ec2 and nixosTests.openstack-image are still broken (not sure this is related to the change in nixos-install).

EDIT: the ec2 and openstack-image tests were broken even before #67232.

@markuskowa markuskowa merged commit 11e0b84 into NixOS:master Oct 7, 2019
@edolstra
Copy link
Member

edolstra commented Oct 7, 2019

Not in favor of this. The whole point of calling nixos-install is to ensure we produce a consistent result.

@edolstra
Copy link
Member

edolstra commented Oct 7, 2019

Reverted in 39c0e48.

@arianvp
Copy link
Member

arianvp commented Oct 7, 2019

@edolstra should we revert https://github.com/NixOS/nixpkgs/pull/67232/files for the time being too then? until we figure out why it broke nixos-install ?

@worldofpeace
Copy link
Contributor

@arianvp Yes please. I understand someone can bring about the optimal solution, but there's no reason to block things because of this.

vcunat added a commit that referenced this pull request Oct 7, 2019
@vcunat
Revert "Merge #67232: machinectl compliant NixOS installation"

Verified

This commit was signed with the committer’s verified signature.
magbak Magnus Bakken
GPG key ID: F7FA2BC3703C0729
Verified
Learn about vigilant mode
f760f0e 
This reverts commit 66967ec, reversing
changes made to fb6595e.
Fixes #70442; discussion: #70027
@hedning hedning mentioned this pull request Oct 8, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovesegfault lovesegfault

@markuskowa markuskowa

@edolstra edolstra

@vcunat vcunat

@fpletz fpletz

@flokli flokli

@peterhoeg peterhoeg

Assignees

@markuskowa markuskowa

Labels
1.severity: blocker This is preventing another PR or issue from being completed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@ck3d @markuskowa @edolstra @arianvp @worldofpeace @flokli @lovesegfault @ckesg