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

disko: depend on nixos-install directly #342320

Merged
merged 5 commits into from
Sep 21, 2024
Merged

disko: depend on nixos-install directly #342320

merged 5 commits into from
Sep 21, 2024

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Sep 16, 2024 •
edited
Loading

Description of changes

These scripts do not depend on the nixos module system and are useful to install nixos from other Linux distributions or enter nixos installation from non-nixos rescue systems.

This addresses #336300 (comment)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 16, 2024
@Mic92 Mic92 force-pushed the nixos-install-cleanups branch 2 times, most recently from d580ee9 to 15207f5 Compare September 16, 2024 15:05
@Mic92
Copy link
Member Author

Mic92 commented Sep 16, 2024

@ofborg test installer.simple

@Mic92
Copy link
Member Author

Mic92 commented Sep 16, 2024

Mhm. The installer now is missing some package...

SuperSandro2000
SuperSandro2000 reviewed Sep 16, 2024
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Thanks for tackling this. Very appreciated.

nixos/modules/installer/tools/tools.nix Outdated Show resolved Hide resolved
pkgs/tools/nix/nixos-install-tools/default.nix Show resolved Hide resolved
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Sep 16, 2024
@ofborg ofborg bot requested a review from Lassulus September 16, 2024 17:26
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Sep 16, 2024
@Mic92 Mic92 marked this pull request as draft September 16, 2024 21:59
@Mic92
Copy link
Member Author

Mic92 commented Sep 20, 2024

#343075 did something similar.

@Mic92 Mic92 marked this pull request as ready for review September 20, 2024 09:26
@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 20, 2024
@Mic92
nixos-enter: set PATH
4cf4459 
otherwise util-linux may be missing.
@Mic92
Copy link
Member Author

Mic92 commented Sep 20, 2024

@ofborg test installer.simple

@Mic92 Mic92 changed the title Move nixos-install/nixos-enter to their own packages disko: depend on nixos-install directly Sep 20, 2024
@Mic92 Mic92 requested a review from K900 September 20, 2024 17:06
K900
K900 approved these changes Sep 20, 2024
View reviewed changes
Copy link
Contributor

@K900 K900 left a comment

Choose a reason for hiding this comment

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

LGTM

@Mic92 Mic92 merged commit 03c0a80 into NixOS:master Sep 21, 2024
30 of 32 checks passed
@Mic92 Mic92 deleted the nixos-install-cleanups branch September 21, 2024 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@K900 K900 K900 approved these changes

@Lassulus Lassulus Awaiting requested review from Lassulus

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Mic92 @K900 @SuperSandro2000