[Backport release-25.05] stdenv: Add CPE fields to meta#438385
[Backport release-25.05] stdenv: Add CPE fields to meta#438385YorikSar wants to merge 3 commits intoNixOS:release-25.05from
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between ea4ddd9 and original dd12290 may warrant inspection.
Show diff
@@ Commit message
This reverts commit de74f9caf0854a9ee8c39774cf4521870fa1f44a.
+ (cherry picked from commit dd12290517ff6e57ab2ca384b101e0cdc617570c)
+
## doc/redirects.json ##
@@
"sec-language-cosmic": [
@@ doc/redirects.json
"index.html#sec-modify-via-packageOverrides"
],
@@
- "var-go-buildTestBinaries": [
- "index.html#var-go-buildTestBinaries"
+ "typst-package-scope-and-usage": [
+ "index.html#typst-package-scope-and-usage"
],
+ "var-meta-identifiers-cpe": [
+ "index.html#var-meta-identifiers-cpe"
@@ pkgs/by-name/he/hello/package.nix: stdenv.mkDerivation (finalAttrs: {
## pkgs/development/compilers/gcc/common/meta.nix ##
@@ pkgs/development/compilers/gcc/common/meta.nix: in
+ platforms = platforms.unix;
teams = [ teams.gcc ];
- mainProgram = "${targetPrefix}gcc";
+ identifiers.cpeParts.vendor = "gnu";
}
## pkgs/development/compilers/gcc/default.nix ##
@@ pkgs/development/compilers/gcc/default.nix: pipe
+ longDescription
platforms
teams
- mainProgram
+ identifiers
;
- };
}
+ // optionalAttrs (!atLeast11) {
## pkgs/development/compilers/llvm/common/common-let.nix ##
@@ pkgs/development/compilers/llvm/common/common-let.nix: rec {
- ++ lib.platforms.riscv
- ++ lib.platforms.m68k
- ++ lib.platforms.loongarch64;
+ ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv
+ ++ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k
+ ++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64;
+
+ identifiers.cpeParts.vendor = "llvm";
};
@@ pkgs/stdenv/generic/check-meta.nix: let
# but it's not part of the actual derivation, i.e., it's not
# passed to the builder and is not a dependency. But since we
@@ pkgs/stdenv/generic/check-meta.nix: let
+ # if you add a new maintainer or team attribute please ensure that this expectation is still met.
maintainers =
attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
-
+- }
+- // {
++
+ identifiers =
+ let
+ defaultCPEParts = {
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
nixpkgs-ci
bot
added
10.rebuild-linux: 1-10
nixpkgs-ci
bot
added
the
8.has: documentation
|
@YorikSar Based on the shown diff it doesn't look right 🤔 |
|
@infinisil diff between patches shows two places where conflicts happened: two in GCC package and one in meta itself. Conflicts in GCC boil down to the addition of |
K900
left a comment
K900
left a comment
There was a problem hiding this comment.
#409797 (comment) needs addressing first.
nix-env writes a warning for each derivation that has null in its meta values, so fields without known values are removed from the result. Fixes issue raised by @K900 in NixOS#409797 (comment) (cherry picked from commit a178fd8)
(cherry picked from commit 5e1eee5)
YorikSar
force-pushed
the
backport-cpe-to-release-25.05
branch
from
460d0a5 to
4895d62
Compare
3 participants
Backport to
release-25.05, done manually because of failed automatic backport by a label in #409797.Before merging, ensure that this backport is acceptable for the release.
Add a 👍 reaction to pull requests you find important.