Skip to content

nixos/top-level: maintenance#199595

Merged
roberth merged 4 commits intoNixOS:masterfrom
hercules-ci:nixos-toplevel-maintenance
Nov 9, 2022
Merged

nixos/top-level: maintenance#199595
roberth merged 4 commits intoNixOS:masterfrom
hercules-ci:nixos-toplevel-maintenance

Conversation

@roberth
Copy link
Member

@roberth roberth commented Nov 4, 2022

Description of changes
  • Remove an old workaround
  • Separation of concerns
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@roberth roberth requested a review from dasJ as a code owner November 4, 2022 23:41
@roberth roberth changed the title nixos/toplevel: maintenance nixos/top-level: maintenance Nov 4, 2022
@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 Nov 4, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 4, 2022
@roberth roberth added the 8.has: clean-up This PR removes packages or removes other cruft label Nov 5, 2022
@roberth roberth merged commit 59f6a93 into NixOS:master Nov 9, 2022
'';
};

system.systemBuilderCommands = mkOption {
Copy link
Member

Choose a reason for hiding this comment

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

Why do we have both this and system.extraSystemBuilderCmds ? they seem to do the exact same?

Copy link
Member Author

Choose a reason for hiding this comment

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

This name is better.

I've looked at the definitions and they're not order sensitive, so we can go ahead and migrate.

Could've done that half a year after this change, but better late than never.

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: clean-up This PR removes packages or removes other cruft 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants