Unverified Commit 1df68e31 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #315098 from NixOS/backport-314939-to-release-24.05 

[Backport release-24.05] grafana-image-renderer: 3.10.2 -> 3.10.5
parents 0b1b49a4 818e4819

pkgs/servers/monitoring/grafana-image-renderer/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,18 +7,18 @@ 


mkYarnPackage rec {

  pname = "grafana-image-renderer";

  version = "3.10.2";

  version = "3.10.5";



  src = fetchFromGitHub {

    owner = "grafana";

    repo = "grafana-image-renderer";

    rev = "v${version}";

    hash = "sha256-GL9uJV4/j3tcD9DMoBuO/59OsfG+njc2FH1Bt3VP7K8=";

    hash = "sha256-Ah78mapwGTD5mTPN7oKk8iwXpp2RMQ8nm0QX3/jTjKU=";

  };



  offlineCache = fetchYarnDeps {

    yarnLock = src + "/yarn.lock";

    hash = "sha256-xgaaIY5Jy8JTSJVGHwPOYgh+fASSPiyoUcmLN516jic=";

    hash = "sha256-o8Bxc5KyoYMYJ6FwQ6PSi7A0LhU4VNuXh5xXbEXLb4Y=";

  };



  packageJSON = ./package.json;

pkgs/servers/monitoring/grafana-image-renderer/package.json

+4 −11
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    "build": "tsc",

    "start": "node build/app.js server --config=dev.json",

    "create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp",

    "push-to-gcom": "sh ./scripts/push-to-gcom.sh",

    "test-update": "cross-env UPDATE_GOLDEN=true jest",

    "test": "sh ./scripts/run_tests.sh",

    "test-ci": "jest",
@@ -32,7 +33,6 @@ 
    "dompurify": "^2.4.0",

    "express": "^4.19.2",

    "express-prom-bundle": "^6.5.0",

    "google-protobuf": "3.21.0",

    "jimp": "^0.22.10",

    "jsdom": "20.0.0",

    "lodash": "^4.17.21",
@@ -51,7 +51,7 @@ 
    "@grafana/eslint-config": "^6.0.0",

    "@types/dompurify": "2.3.4",

    "@types/express": "^4.17.14",

    "@types/jest": "^29.5.7",

    "@types/jest": "^29.5.12",

    "@types/jsdom": "20.0.0",

    "@types/multer": "1.4.7",

    "@types/node": "^18.7.18",
@@ -62,20 +62,13 @@ 
    "axios": "1.6.7",

    "cross-env": "7.0.3",

    "eslint": "8.23.1",

    "eslint-config-prettier": "8.5.0",

    "eslint-plugin-jsdoc": "^46.5.0",

    "eslint-plugin-prettier": "4.2.1",

    "eslint-plugin-react": "7.31.8",

    "eslint-plugin-react-hooks": "4.6.0",

    "fast-png": "^6.2.0",

    "husky": "8.0.1",

    "jest": "^29.7.0",

    "jsonwebtoken": "^9.0.2",

    "lint-staged": "13.0.3",

    "pkg": "5.8.1",

    "pkg": "^5.8.1",

    "prettier": "2.7.1",

    "superagent": "^8.1.2",

    "supertest": "^6.3.3",

    "supertest": "^7.0.0",

    "ts-jest": "^29.1.1",

    "ts-node": "10.9.1",

    "tsc-watch": "5.0.3",