Skip to content

[24.11] grafana: 11.3.7 -> 11.3.7+security-01, fix CVE-2025-3415#416418

Merged
leona-ya merged 1 commit intoNixOS:release-24.11from
Ma27:bump-grafana-24.11
Jun 13, 2025
Merged

[24.11] grafana: 11.3.7 -> 11.3.7+security-01, fix CVE-2025-3415#416418
leona-ya merged 1 commit intoNixOS:release-24.11from
Ma27:bump-grafana-24.11

Conversation

@Ma27
Copy link
Copy Markdown
Member

@Ma27 Ma27 commented Jun 13, 2025

ChangeLog: https://github.com/grafana/grafana/releases/v11.3.7+security-01

Things done

  • Built on platform(s)
    • x86_64-linux
    • 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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@Ma27 Ma27 added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jun 13, 2025
@github-actions github-actions Bot added the 4.workflow: backport This targets a stable branch label Jun 13, 2025
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot left a comment

Choose a reason for hiding this comment

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

This report is automatically generated by the check-cherry-picks CI workflow.

Some of the commits in this PR have not been cherry-picked exactly and require the author's and reviewer's attention.

Please make sure to follow the backporting guidelines and cherry-pick with the -x flag. This requires changes to go to the unstable branches (master / staging) first, before backporting them.

Occasionally, it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts while cherry-picking or when updating minor versions of packages which have already advanced to the next major on unstable. If you need to merge this PR despite the warnings, please dismiss this review.

Warning

Couldn't locate original commit hash in message of 8e2ce34.

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@github-actions github-actions Bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. labels Jun 13, 2025
@Ma27 Ma27 dismissed github-actions[bot]’s stale review June 13, 2025 10:50

24.11 has an older version of Grafana packaged. We're not going to upgrade to v12, but we need to patch out the CVE mentioned in the commit.

@leona-ya leona-ya merged commit fcf89cf into NixOS:release-24.11 Jun 13, 2025
19 of 22 checks passed
@Ma27 Ma27 deleted the bump-grafana-24.11 branch June 13, 2025 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 4.workflow: backport This targets a stable branch 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants