grafana: 9.1.6 -> 9.1.7; changed dependency: yarn -> yarn-gallium

3 files changed, 23 insertions, 12 deletions

diff --git a/grafana/.footprint b/grafana/.footprint
index 08736a824..c82b2b73b 100644
--- a/grafana/.footprint
+++ b/grafana/.footprint
@@ -717,6 +717,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/alerting/unified/comp
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rule-editor/PreviewRule.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rule-editor/PreviewRuleResult.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rule-editor/QueryEditor.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rule-editor/QueryEditor.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
@@ -1062,6 +1063,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dashboard/components/
 drwxr-xr-x	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/SaveDashboardButton.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDiff.tsx
+-rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.test.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
 -rw-r--r--	root/root	usr/share/grafana/public/app/features/dashboard/components/SaveDashboard/UnsavedChangesModal.tsx
diff --git a/grafana/.signature b/grafana/.signature
index 474fa48a5..fa5b6f16e 100644
--- a/grafana/.signature
+++ b/grafana/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33Og+lXXEs0nvS4lZ9WO9TLpn1sqOuMzXDBtgb99RnxOJgXLd79X8F5JUHyDhI9AdN24D+1djQDE+2N84S5J9AI=
-SHA256 (Pkgfile) = 113f70ff61cb6b7ce77e9d48c179d06d42bdcecc23124ad8cece525779b4ec59
-SHA256 (.footprint) = 07891e9e7c5031b7c1a3f584314aba06acf777a54f191819996d7ce8712bfdda
-SHA256 (grafana-9.1.6.tar.gz) = 97b65fe9d9500bfba03d8a0e2316758b950fea76601c66bde4438db404b9ec1a
-SHA256 (grafana-9.1.6.linux-amd64.tar.gz) = 7ed2c49eb1c4dfab90fcb8fa84d3e500de0ac8d9b83f99b773b1fc7ab267915b
+RWSagIOpLGJF37wxEPHmeoNJp+7zwc16D28fw+6cGo7+hNrpmcQGaoDDp5d9tUrE/DBy6HdbBNPL+b2mLhTT2fyhI9/qCAZolws=
+SHA256 (Pkgfile) = 6d79a33dc0e1ad2b255dac472b57a151e7c4fff97fa28265087a9e8dc7a6f89a
+SHA256 (.footprint) = 66f762940a9abf73be61f5a5b378d49d6eeace765f0933ec878d0cf49f2646e3
+SHA256 (grafana-9.1.7.tar.gz) = dac3d154901a9d5e0d1a21f3b3a5b06ea62e86aa03c4e2fa1fe38257887f3439
+SHA256 (grafana-9.1.7.linux-amd64.tar.gz) = 8a85dcf547db351cff44276715f6840d1c6d6a647cb2df567352d0eb0765f121
 SHA256 (grafana.confd) = 302e0281dea67cde2edd1e7d06bd7abf6a8b335595c050ffa874cb1c1bd19036
 SHA256 (grafana.service) = 3b652a54c5f26d19197955854483687d7c761a2299788a182200acd5d1ffbb47
diff --git a/grafana/Pkgfile b/grafana/Pkgfile
index dd678661c..e7657ec31 100644
--- a/grafana/Pkgfile
+++ b/grafana/Pkgfile
@@ -1,10 +1,10 @@
 # Description: The analytics platform for all your metrics
 # URL: https://grafana.com/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: fontconfig go yarn
+# Depends on: fontconfig go yarn-gallium
 
 name=grafana
-version=9.1.6
+version=9.1.7
 release=1
 source=(https://github.com/grafana/grafana/archive/v$version/$name-$version.tar.gz
   https://dl.grafana.com/oss/release/grafana-$version.linux-amd64.tar.gz
@@ -20,6 +20,10 @@ build() {
   mkdir "$PKGMK_SOURCE_DIR/gopath" || true
   export GOPATH="$PKGMK_SOURCE_DIR/gopath"
 
+  export PKG_CONFIG_PATH="/usr/opt/nodejs-lts-gallium/lib/pkgconfig:$PKG_CONFIG_PATH"
+  export PKG_CONFIG_PATH="/usr/lib/openssl-1.1/pkgconfig:$PKG_CONFIG_PATH"
+  export PATH="/usr/opt/nodejs-lts-gallium/bin:$PATH"
+
   cd $SRC/$name-$version
 
   sed -ri 's,^(\s*data\s*=).*,\1 /var/lib/grafana,' conf/defaults.ini
@@ -27,15 +31,20 @@ build() {
   sed -ri 's,^(\s*provisioning\s*=).*,\1 /var/lib/grafana/conf/provisioning,' conf/defaults.ini
   sed -ri 's,^(\s*logs\s*=).*,\1 /var/log/grafana,' conf/defaults.ini
 
+  # backend
   make gen-go
   go run build.go setup
   go run build.go build
-  export NPM_CONFIG_PREFIX="$srcdir/npm"
-  export PATH+=":$NPM_CONFIG_PREFIX/bin"
-  export NODE_OPTIONS="--max-old-space-size=16000" # Increase to 8 GB
-  yarn install
-  NODE_ENV=production yarn run build
 
+  # frontend
+  export NPM_CONFIG_PREFIX="$SRC/npm"
+  export PATH="$NPM_CONFIG_PREFIX/bin:$PATH"
+  export NODE_OPTIONS="--max-old-space-size=16000"
+
+  /usr/opt/nodejs-lts-gallium/bin/yarn install
+  NODE_ENV=production /usr/opt/nodejs-lts-gallium/bin/yarn run build
+
+  # install
   install -Dm644 $SRC/$name.confd $PKG/etc/conf.d/$name
   install -Dsm755 bin/linux-amd64/grafana-server $PKG/usr/bin/grafana-server
   install -Dsm755 bin/linux-amd64/grafana-cli $PKG/usr/bin/grafana-cli