Skip to content

config.rust: update references from rustc#319624

Merged
Kranzes merged 1 commit intoNixOS:masterfrom
flokli:rust-config
Jun 13, 2024
Merged

config.rust: update references from rustc#319624
Kranzes merged 1 commit intoNixOS:masterfrom
flokli:rust-config

Conversation

@flokli
Copy link
Member

@flokli flokli commented Jun 13, 2024

rustc.config is called rust.rustcTarget now, and {rustc -> rust}.platform.

This is the new way (tm), and is preferred since
#271707 -
though the documentation still is outdated, and some expressions in nixpkgs were using the old interface.

This updates both.

Things done

  • Built on platform(s)
    • x86_64-linux (rust-hypervisor-firmware)
    • 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.

`rustc.config` is called `rust.rustcTarget` now, and
`{rustc -> rust}.platform`.

This is the new way (tm), and is preferred since
NixOS#271707 -
though the documentation still is outdated, and some expressions in
nixpkgs were using the old interface.

This updates both.
@github-actions github-actions bot added 8.has: documentation This PR adds or changes documentation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: lib The Nixpkgs function library labels Jun 13, 2024
Copy link
Member

@Kranzes Kranzes left a comment

Choose a reason for hiding this comment

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

LGTM

@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 Jun 13, 2024
SFrijters added a commit to SFrijters/nix-qemu-esp32c3-rust-example that referenced this pull request Jun 13, 2024
New way of setting the rust target, cf. NixOS/nixpkgs#319624
@Kranzes Kranzes merged commit 85d871c into NixOS:master Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: lib The Nixpkgs function library 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: documentation This PR adds or changes documentation 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