Skip to content

treewide: remove toplevel system attr#142616

Merged
r-burns merged 8 commits intoNixOS:masterfrom
r-burns:toplevel-system
Oct 27, 2021
Merged

treewide: remove toplevel system attr#142616
r-burns merged 8 commits intoNixOS:masterfrom
r-burns:toplevel-system

Conversation

@r-burns
Copy link
Copy Markdown
Contributor

@r-burns r-burns commented Oct 22, 2021

Motivation for this change

This is motivated by #27069, but intentionally avoids any of the sticky deprecation questions which have caused that issue to stall out. The alias is still going to be there for the foreseeable future - this PR just fixes the few remaining uses in nixpkgs, and guards it behind allowAliases so we don't have to worry about it reappearing.

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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 21.11 Release Notes (or backporting 21.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.

@r-burns r-burns requested a review from Ericson2314 October 22, 2021 23:42
@ofborg ofborg bot added 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 Oct 22, 2021
Comment thread pkgs/servers/adguardhome/default.nix Outdated
@Ericson2314
Copy link
Copy Markdown
Member

Good idea. Maybe there is a lot more things that can be dealt with this way.

Note that targetPlatform was incorrect when cross-compiling,
and should be hostPlatform
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Oct 25, 2021
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Oct 26, 2021
@cole-h
Copy link
Copy Markdown
Member

cole-h commented Oct 26, 2021

@ofborg eval

Copy link
Copy Markdown
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.

please merge if ofborg is done

@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Oct 27, 2021
@r-burns
Copy link
Copy Markdown
Contributor Author

r-burns commented Oct 27, 2021

@ofborg eval

@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Oct 27, 2021
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Oct 27, 2021
@cole-h
Copy link
Copy Markdown
Member

cole-h commented Oct 27, 2021

Ah, this issue is one we've come across in the past... There are too many statuses on one commit, which GH doesn't like. If you force-push (or add a new commit, or anything to that effect), that will fix it for real.

@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Oct 27, 2021
This is an old compat definition for stdenv.hostPlatform.system
@r-burns
Copy link
Copy Markdown
Contributor Author

r-burns commented Oct 27, 2021

Thank you, looks like that did the trick

@SuperSandro2000
Copy link
Copy Markdown
Member

This change broke home-manager. See above link for details.

@xaverdh
Copy link
Copy Markdown
Contributor

xaverdh commented Oct 28, 2021

maybe we should add some home-manager checks to ofborg?

@kubukoz kubukoz mentioned this pull request Oct 28, 2021
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Development

Successfully merging this pull request may close these issues.

6 participants