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

nixos/tools: start cleanup #343075

Merged
merged 4 commits into from
Sep 20, 2024
Merged

nixos/tools: start cleanup #343075

merged 4 commits into from
Sep 20, 2024

Conversation

K900
Copy link
Contributor

@K900 K900 commented Sep 19, 2024

Description of changes

This is kind of a spiritual successor to #238557, achieved by just moving more things out of the NixOS module system and into normal packages. This iteration starts with nixos-build-vms, nixos-enter and nixos-install, all three of which don't depend on any config state except Nix itself. nixos-generate-config can probably also move out, but will require some refactoring to do so, and I'm not sure about nixos-version, but this is a start.

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.

It has no other consumers anyway. Also saves some work.
@K900 K900 requested a review from r-vdp September 19, 2024 17:18
@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 19, 2024
@r-vdp
Copy link
Contributor

r-vdp commented Sep 19, 2024

The main objective of the mentioned PR, was to avoid rebuilding system-path on every commit. Making the packages overridable was kind of a side mission.

I'm also very much in favour of this change by itself though, it's annoying when packages are not easily overridable.

@K900
Copy link
Contributor Author

K900 commented Sep 19, 2024

That's going to be in the next commits that I haven't finished yet :)

Copy link
Contributor

@r-vdp r-vdp left a comment

Choose a reason for hiding this comment

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

LGTM!

@K900 K900 force-pushed the nixos-tools-cleanup branch 2 times, most recently from 3ac493c to 558158a Compare September 19, 2024 17:54
@K900
Copy link
Contributor Author

K900 commented Sep 19, 2024

@NixOS/nixpkgs-vet that's an interesting failure mode

@K900
Copy link
Contributor Author

K900 commented Sep 19, 2024

@ofborg test nixos-rebuild installer

@K900
Copy link
Contributor Author

K900 commented Sep 20, 2024

@ofborg test nixos-rebuild installer

@K900
Copy link
Contributor Author

K900 commented Sep 20, 2024

OK, looking at nixos-generate-config, that'll be a huge pain to untangle and I'm considering just rewriting it entirely, so I'm going to send this as is, as it's already an improvement.

@K900 K900 merged commit 685d691 into NixOS:master Sep 20, 2024
25 of 31 checks passed
@philiptaron
Copy link
Contributor

Nice work on this @K900.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants