Skip to content

Conversation

@ShamrockLee
Copy link
Contributor

@ShamrockLee ShamrockLee commented Nov 4, 2025

pname and version are sometime specified as null to get them ignored. If we only check the existence of pname without checking if it's null, we'll end up specifying meta.cpeParts.product = null.

This PR unbreaks

bundlerEnv passes pname and version as null to buildEnv in case they pname and version isn't specified when calling bundlerEnv. In previous implementation, buildEnv only passes pname and version down if they are non-null. To simplify name handling, PR #432957 passes name, pname and version as specified to stdenvNoCC.mkDerivation and surface the issue.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci 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. 6.topic: stdenv Standard environment labels Nov 4, 2025
@ShamrockLee ShamrockLee marked this pull request as ready for review November 4, 2025 17:28
@ShamrockLee ShamrockLee requested a review from YorikSar November 4, 2025 17:32
@ShamrockLee
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 458529
Commit: 5ffd35a7064449f2aabd5aef0d681b06b3022187

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 4, 2025
@MattSturgeon MattSturgeon added the backport release-25.05 Backport PR automatically label Nov 4, 2025
@MattSturgeon MattSturgeon added this pull request to the merge queue Nov 4, 2025
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Nov 4, 2025
Merged via the queue into NixOS:master with commit b54936c Nov 4, 2025
37 of 40 checks passed
@github-project-automation github-project-automation bot moved this to Done in Stdenv Nov 4, 2025
@nixpkgs-ci

This comment was marked as resolved.

@MattSturgeon
Copy link
Contributor

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Looks like CPE field itself wasn't backported, so this doesn't need backporting after all: #439074 (comment)

There's also discussion around postponing until after 25.11: #439074 (comment)

@MattSturgeon MattSturgeon removed the backport release-25.05 Backport PR automatically label Nov 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: stdenv Standard environment 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. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants