Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[www-apps/grafana] bump

Browse Source
This commit is contained in:
Robert Förster
2025-11-22 12:46:21 +01:00
parent 0835dea374
commit a8484ad0ea
3 changed files with 8 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www-apps/grafana/Manifest
View File

@@ -1,4 +1,4 @@
DIST grafana-12.2.1-vendor.tar.xz 56449456 BLAKE2B 409a9dfe0ba6ec9049476689f9f933ba5d7cf3e5312fa7aca30f7b66f9dc1f3bc1550ea7dbf636619a328bdadcde3d4f9af8db0e01fc614ce0c84cc980335797 SHA512 44d51c9d30132a65d1b669d148df848f6bdba168c5fd732f5458c165972b96a9e82ceeb589a60b4b679b8cd343edccc02ef6eff4f3dc2092b7701ab45a493bb8
DIST grafana-12.2.1-vendor_yarn.tar.xz 309446896 BLAKE2B 8c75c83eff3bed5ba8e46c9325e0485cf6215ec8d482f4572901830928bd62067e4313f198745f7abdb5f7fb821dd2b74214f0065932a1371dd4d439f304c5c9 SHA512 63bd50e058458c5ab22a7d2ef2fb8eec8dc8a26b06d0889f7dbba4b9b5992951118f3e16f72cc2d071070ad8db86be6c609897c24f8c8d6b2e180d92fca7fd63
DIST grafana-12.2.1.tar.gz 42267564 BLAKE2B e938e02794e01b04c932f3c1766b8609453c76daef1ef1f5a466ec872c6aaf338e4f21042f6da915ff8ac3ea3cc63fb18659af334f2f9f05a2f6c02e12eb6f62 SHA512 cc85cc2b644d31479abfcd17a0b9b33fa2e71294fd60962b565dccb3c336afcf6297eaaa0ac71c8d8ce1e7a53bb2a1957839dd179b0cdf9f5c9aff0162bc1943
DIST yarn-4.9.2.cjs 3005024 BLAKE2B b7d02b8ca523e48b4cd7430640acca2f81cce8737a5f14dabe7c8aae8584a4130edc72f997ca75ce010cae2739bb52a5fae47461102088311d2ef3b7e8625f8d SHA512 1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c
DIST grafana-12.3.0-vendor.tar.xz 53257020 BLAKE2B d27f8a7cfcd383dcf76452dc041c0b47dc8044632cafde061164e8d028c7f8f86bc34189d5b1199a07b1370320c60f8b6cc6cecce739c3d5705bc83823e2aab7 SHA512 66f32e5498f3878ecc84915ec4dfdf4336986f0470c005533cc35335d01dce448a4313afbc6b85e8531d47b399ea6ee483dc1aba13b126d0cc47336478880a06
DIST grafana-12.3.0-vendor_yarn.tar.xz 332627600 BLAKE2B 4c57d144be1eb1e7bd6c9627ac64cae2de0ba8ebcb08a3c0014176e3eb61705ccf20d8e71ffb0f1b16df4f3ae87e62e1c8a698092be68b3dbe1186b59f9db7b9 SHA512 eb4862e0233b2f4f7fa3b8d9a68db40676180af3e59b2b17515db54e65737717a2c115d7559c395b4c2c086dda6f2d02a829b495c9624d570ff82ecba68d075c
DIST grafana-12.3.0.tar.gz 44722381 BLAKE2B 39f795af5979bb6d6a8526926cb7a934276e320bfa805823aa8d1086c65730f2d07fb0ddce554fe191b204c4e295fce247dae94417e3eabf77e5ed2eb4ff0b9d SHA512 0a80972b70e19ea5fa3580866c51917313fd393862c1d27631aca422abe6d080dd5e2517d0e1429d7accde9f1b2a10a2ef121378ad0fb4726534b7c765e1f7fd
DIST yarn-4.10.3.cjs 2990158 BLAKE2B 7816f6e5681da605820691fed1d3247c552936e1a7f57590ac33569cda2506b3f183ee2b30a3c474be900da7d01ed7514c2a871285b7d25c6e13f288afcd19dd SHA512 c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f

131
www-apps/grafana/files/grafana-12.1.1-node-22.18.0.patch
View File

@@ -1,131 +0,0 @@
From 481caac25da9fcf329833a8730d0b43db486fe82 Mon Sep 17 00:00:00 2001
From: Matt Cowley <me@mattcowley.co.uk>
Date: Wed, 9 Jul 2025 17:54:00 +0100
Subject: [PATCH] Plugin Configs: Fix Env types (#107908)
(cherry picked from commit 21f305c6a0e242463f5219cc6944fb880ea809f0)
---
e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts | 4 ++--
e2e/test-plugins/grafana-test-datasource/webpack.config.ts | 4 ++--
packages/grafana-plugin-configs/webpack.config.ts | 2 +-
public/app/plugins/datasource/azuremonitor/webpack.config.ts | 4 ++--
.../datasource/grafana-pyroscope-datasource/webpack.config.ts | 4 ++--
public/app/plugins/datasource/jaeger/webpack.config.ts | 4 ++--
public/app/plugins/datasource/mssql/webpack.config.ts | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts b/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts
index 6268c183d3553..564555396a5e4 100644
--- a/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts
+++ b/e2e/test-plugins/grafana-extensionstest-app/webpack.config.ts
@@ -1,5 +1,5 @@
import CopyWebpackPlugin from 'copy-webpack-plugin';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
import { mergeWithCustomize, unique } from 'webpack-merge';
import { type Configuration } from 'webpack';
@@ -19,7 +19,7 @@ function skipFiles(f: string): boolean {
return true;
}
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
const customConfig = {
plugins: [
diff --git a/e2e/test-plugins/grafana-test-datasource/webpack.config.ts b/e2e/test-plugins/grafana-test-datasource/webpack.config.ts
index 6268c183d3553..564555396a5e4 100644
--- a/e2e/test-plugins/grafana-test-datasource/webpack.config.ts
+++ b/e2e/test-plugins/grafana-test-datasource/webpack.config.ts
@@ -1,5 +1,5 @@
import CopyWebpackPlugin from 'copy-webpack-plugin';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
import { mergeWithCustomize, unique } from 'webpack-merge';
import { type Configuration } from 'webpack';
@@ -19,7 +19,7 @@ function skipFiles(f: string): boolean {
return true;
}
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
const customConfig = {
plugins: [
diff --git a/packages/grafana-plugin-configs/webpack.config.ts b/packages/grafana-plugin-configs/webpack.config.ts
index 86c1d1eafc992..c1bfc469d7b5b 100644
--- a/packages/grafana-plugin-configs/webpack.config.ts
+++ b/packages/grafana-plugin-configs/webpack.config.ts
@@ -31,7 +31,7 @@ function skipFiles(f: string): boolean {
return true;
}
-type Env = {
+export type Env = {
[key: string]: true | string | Env;
};
diff --git a/public/app/plugins/datasource/azuremonitor/webpack.config.ts b/public/app/plugins/datasource/azuremonitor/webpack.config.ts
index 301bafbd1f90f..875ef0a489376 100644
--- a/public/app/plugins/datasource/azuremonitor/webpack.config.ts
+++ b/public/app/plugins/datasource/azuremonitor/webpack.config.ts
@@ -1,9 +1,9 @@
import type { Configuration } from 'webpack';
import { merge } from 'webpack-merge';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
return merge(baseConfig, {
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
index 7a579fa172b60..f48f8b1a69353 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts
@@ -1,6 +1,6 @@
-import config from '@grafana/plugin-configs/webpack.config.ts';
+import config, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
-const configWithFallback = async (env: Record<string, unknown>) => {
+const configWithFallback = async (env: Env) => {
const response = await config(env);
if (response !== undefined && response.resolve !== undefined) {
response.resolve.fallback = {
diff --git a/public/app/plugins/datasource/jaeger/webpack.config.ts b/public/app/plugins/datasource/jaeger/webpack.config.ts
index 9ff90fccf0c3d..0346a64c5f22e 100644
--- a/public/app/plugins/datasource/jaeger/webpack.config.ts
+++ b/public/app/plugins/datasource/jaeger/webpack.config.ts
@@ -1,10 +1,10 @@
import { createRequire } from 'node:module';
-import config from '@grafana/plugin-configs/webpack.config.ts';
+import config, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
const require = createRequire(import.meta.url);
-const configWithFallback = async (env: Record<string, unknown>) => {
+const configWithFallback = async (env: Env) => {
const response = await config(env);
if (response !== undefined && response.resolve !== undefined) {
response.resolve.fallback = {
diff --git a/public/app/plugins/datasource/mssql/webpack.config.ts b/public/app/plugins/datasource/mssql/webpack.config.ts
index af2e94ddecf42..8a119f88315bd 100644
--- a/public/app/plugins/datasource/mssql/webpack.config.ts
+++ b/public/app/plugins/datasource/mssql/webpack.config.ts
@@ -1,9 +1,9 @@
import type { Configuration } from 'webpack';
import { merge } from 'webpack-merge';
-import grafanaConfig from '@grafana/plugin-configs/webpack.config.ts';
+import grafanaConfig, { type Env } from '@grafana/plugin-configs/webpack.config.ts';
-const config = async (env: Record<string, unknown>): Promise<Configuration> => {
+const config = async (env: Env): Promise<Configuration> => {
const baseConfig = await grafanaConfig(env);
return merge(baseConfig, {

8
www-apps/grafana/grafana-12.2.1.ebuild → www-apps/grafana/grafana-12.3.0.ebuild
View File

@@ -10,7 +10,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
DESCRIPTION="The open-source platform for monitoring and observability"
HOMEPAGE="https://grafana.com"
yarn_version="4.9.2"
yarn_version="4.10.3"
## building vendor and yarn vendors needs nodejs[npm]
# >> git clone https://github.com/grafana/grafana -b v<version> /tmp/grafana
@@ -18,7 +18,7 @@ yarn_version="4.9.2"
# >> GOWORK=off go mod vendor && go work vendor && mkdir grafana-${version} && mv vendor grafana-${version}/vendor
# >> tar -caf grafana-${version}-vendor.tar.xz grafana-${version}/vendor
# >> echo -e "enableMirror: true\ncacheFolder: ./vendor_yarn" >> .yarnrc.yml
# >> CYPRESS_INSTALL_BINARY=0 yarn set version 4.9.2
# >> CYPRESS_INSTALL_BINARY=0 yarn set version 4.10.3
# >> CYPRESS_INSTALL_BINARY=0 yarn cache clean --mirror && yarn install
# >> mv vendor_yarn grafana-${version}/vendor_yarn
# >> tar -caf grafana-${version}-vendor_yarn.tar.xz grafana-${version}/vendor_yarn
@@ -33,7 +33,7 @@ LICENSE="AGPL-3.0 Apache-2.0 BSD-2 BSD-3 BSD-4 BSL-1.0 ImageMagick ISC LGPL-3.0
SLOT="12/"${PV}
KEYWORDS="~amd64"
IUSE="systemd"
RESTRICT="test" # Tests not working (a proper fix would take to long)
RESTRICT="test" # Tests not working (a proper fix would take too long)
# needed for webpack (nodejs)
CHECKREQS_MEMORY="8G"
@@ -44,7 +44,7 @@ DEPEND="!www-apps/${PN}-bin
"
BDEPEND="media-libs/fontconfig
net-libs/nodejs:0/22[icu]
net-libs/nodejs:0/24[icu]
sys-apps/yarn
>=dev-lang/go-1.25
>=dev-go/wire-0.6.0"