From d3fb14bf7335c50a6357a0e54841100e7299ea7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 31 Aug 2026 14:50:35 +0200 Subject: [PATCH 1/2] firefox*: add cpe parts --- .../browsers/firefox/packages/firefox-esr-140.nix | 7 +++++++ .../browsers/firefox/packages/firefox-esr-153.nix | 7 +++++++ .../networking/browsers/firefox/packages/firefox.nix | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix index 4fe1cccadb7b..7c35569b2157 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix @@ -24,6 +24,13 @@ buildMozillaMach rec { maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "firefox"; + identifiers.cpeParts = { + product = "firefox"; + sw_edition = "esr"; + update = "*"; + vendor = "mozilla"; + version = lib.removeSuffix "esr" version; + }; }; tests = { inherit (nixosTests) firefox-esr-140; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix index 736f99afa6ac..b7fbd0eb2148 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix @@ -25,6 +25,13 @@ buildMozillaMach rec { maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "firefox"; + identifiers.cpeParts = { + product = "firefox"; + sw_edition = "esr"; + update = "*"; + vendor = "mozilla"; + version = lib.removeSuffix "esr" version; + }; }; tests = { inherit (nixosTests) firefox-esr-153; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 70bff435efee..8c9ade933b46 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -30,6 +30,12 @@ buildMozillaMach rec { maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "firefox"; + identifiers.cpeParts = { + inherit version; + product = "firefox"; + update = "*"; + vendor = "mozilla"; + }; }; tests = { inherit (nixosTests) firefox; From 668d36b9159241f953dd3d5b393f21b248e2194d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 31 Aug 2026 15:31:03 +0200 Subject: [PATCH 2/2] firefox*: add purl parts --- .../firefox/packages/firefox-esr-140.nix | 18 ++++++++++++------ .../firefox/packages/firefox-esr-153.nix | 18 ++++++++++++------ .../browsers/firefox/packages/firefox.nix | 16 +++++++++++----- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix index 7c35569b2157..a87bad25a601 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix @@ -24,12 +24,18 @@ buildMozillaMach rec { maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "firefox"; - identifiers.cpeParts = { - product = "firefox"; - sw_edition = "esr"; - update = "*"; - vendor = "mozilla"; - version = lib.removeSuffix "esr" version; + identifiers = { + cpeParts = { + product = "firefox"; + sw_edition = "esr"; + update = "*"; + vendor = "mozilla"; + version = lib.removeSuffix "esr" version; + }; + purlParts = { + type = "generic"; + spec = "firefox@${lib.removeSuffix "esr" version}"; + }; }; }; tests = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix index b7fbd0eb2148..c59d80099bb6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix @@ -25,12 +25,18 @@ buildMozillaMach rec { maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "firefox"; - identifiers.cpeParts = { - product = "firefox"; - sw_edition = "esr"; - update = "*"; - vendor = "mozilla"; - version = lib.removeSuffix "esr" version; + identifiers = { + cpeParts = { + product = "firefox"; + sw_edition = "esr"; + update = "*"; + vendor = "mozilla"; + version = lib.removeSuffix "esr" version; + }; + purlParts = { + type = "generic"; + spec = "firefox@${lib.removeSuffix "esr" version}"; + }; }; }; tests = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 8c9ade933b46..df8211d5f9bb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -30,11 +30,17 @@ buildMozillaMach rec { maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "firefox"; - identifiers.cpeParts = { - inherit version; - product = "firefox"; - update = "*"; - vendor = "mozilla"; + identifiers = { + cpeParts = { + inherit version; + product = "firefox"; + update = "*"; + vendor = "mozilla"; + }; + purlParts = { + type = "generic"; + spec = "firefox@${version}"; + }; }; }; tests = {