From 22ca96f3a9d9ede14898f889f4749defb2278ab5 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Mon, 16 Feb 2026 15:10:10 +0100 Subject: [PATCH] various: add meta.identifier.cpeParts to a batch of packages Co-Authored-By: Silvan Mosberger --- pkgs/by-name/au/audit/package.nix | 5 +++++ pkgs/by-name/bo/boehmgc/package.nix | 5 +++++ pkgs/by-name/ca/cacert/package.nix | 3 +++ pkgs/by-name/li/libcap_ng/package.nix | 1 + pkgs/by-name/lo/logrotate/package.nix | 1 + pkgs/by-name/op/openresolv/package.nix | 1 + pkgs/by-name/sh/shadow/package.nix | 1 + pkgs/by-name/ut/util-linux/package.nix | 2 ++ pkgs/development/compilers/gcc/common/meta.nix | 2 +- pkgs/development/compilers/llvm/common/llvm/default.nix | 4 ++++ pkgs/development/libraries/acl/default.nix | 1 + pkgs/development/libraries/attr/default.nix | 1 + pkgs/development/libraries/glibc/default.nix | 1 + pkgs/os-specific/linux/busybox/default.nix | 1 + pkgs/tools/misc/findutils/default.nix | 1 + .../package-management/nix/modular/packaging/everything.nix | 1 + pkgs/tools/text/gnugrep/default.nix | 3 +++ 17 files changed, 33 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index da374e413f20c..236234cee0146 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -175,5 +175,10 @@ stdenv.mkDerivation (finalAttrs: { "auparse" ]; platforms = lib.platforms.linux; + identifiers.cpeParts = + lib.meta.cpeFullVersionWithVendor "linux_audit_project" finalAttrs.version + // { + product = "linux_audit"; + }; }; }) diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index d4616fbd002be..136d9e9c005f2 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -120,5 +120,10 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.boehmGC; maintainers = [ ]; platforms = lib.platforms.all; + identifiers.cpeParts = + lib.meta.cpeFullVersionWithVendor "boehm-demers-weiser" finalAttrs.version + // { + product = "garbage_collector"; + }; }; }) diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index ccfb2b777d96d..bb52e8104f18d 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -34,6 +34,9 @@ let lukegb ]; license = lib.licenses.mpl20; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "mozilla" version // { + product = "nss"; + }; }; certdata = stdenv.mkDerivation { pname = "nss-cacert-certdata"; diff --git a/pkgs/by-name/li/libcap_ng/package.nix b/pkgs/by-name/li/libcap_ng/package.nix index 99b7547c8fccf..da302c3cf49bd 100644 --- a/pkgs/by-name/li/libcap_ng/package.nix +++ b/pkgs/by-name/li/libcap_ng/package.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ grimmauld ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libcap-ng_project" finalAttrs.version; }; }) diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix index b0c08570fc137..c4f49d4b420ca 100644 --- a/pkgs/by-name/lo/logrotate/package.nix +++ b/pkgs/by-name/lo/logrotate/package.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.tobim ]; platforms = lib.platforms.all; mainProgram = "logrotate"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "logrotate_project" finalAttrs.version; }; }) diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix index c924ad4700d62..853cf18b12ffb 100644 --- a/pkgs/by-name/op/openresolv/package.nix +++ b/pkgs/by-name/op/openresolv/package.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; maintainers = [ ]; platforms = lib.platforms.unix; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openresolv_project" finalAttrs.version; }; }) diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 24a2f1fc11e54..4094c6e99f915 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.linux; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "shadow_project" finalAttrs.version; }; passthru = { diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 0cb22af94bd61..27dd6e4abe9ba 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -254,5 +254,7 @@ stdenv.mkDerivation (finalAttrs: { "uuid" ]; priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages + + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "kernel" finalAttrs.version; }; }) diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix index e0325feafbe80..cf6b3447231e8 100644 --- a/pkgs/development/compilers/gcc/common/meta.nix +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -30,5 +30,5 @@ in teams = [ teams.gcc ]; mainProgram = "${targetPrefix}gcc"; - identifiers.cpeParts.vendor = "gnu"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version; } diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index a9ee0a7ff4d1e..1ea7c1b3a953e 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -594,6 +594,10 @@ stdenv.mkDerivation ( widely used in academic research. Code in the LLVM project is licensed under the "Apache 2.0 License with LLVM exceptions". ''; + identifiers.cpeParts = llvm_meta.identifiers.cpeParts // { + inherit version; + update = "*"; + }; }; } // lib.optionalAttrs enableManpages { diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 9305fa351d17d..be4fbcd6cdde3 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://savannah.nongnu.org/projects/acl"; description = "Library and tools for manipulating access control lists"; license = lib.licenses.gpl2Plus; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "acl_project" version; }; } diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index cc34c00e92a7f..0c8897ef0160e 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; badPlatforms = lib.platforms.microblaze; license = lib.licenses.gpl2Plus; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "attr_project" version; }; } diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 987c8dd7f199e..b62bac16e287e 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -216,5 +216,6 @@ in meta = (previousAttrs.meta or { }) // { description = "GNU C Library"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" previousAttrs.passthru.minorRelease; }; }) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index b7c574ec171aa..c104589f3f75c 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -198,5 +198,6 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; priority = 15; # below systemd (halt, init, poweroff, reboot) and coreutils + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "busybox" version; }; } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index a5e8459355ac9..569877e9c9940 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -106,5 +106,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; mainProgram = "find"; maintainers = [ lib.maintainers.mdaniels5757 ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" finalAttrs.version; }; }) diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix index 62873710bcf39..8f40b8e4250fb 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix @@ -252,6 +252,7 @@ stdenv.mkDerivation (finalAttrs: { "nix-util" "nix-util-c" ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "nixos" version; }; }) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index d22e3434d7389..c353e1cd938d4 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -115,6 +115,9 @@ stdenv.mkDerivation { ]; platforms = lib.platforms.all; mainProgram = "grep"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version // { + product = "grep"; + }; }; passthru = {