diff --git a/pkgs/by-name/pe/perses/package.nix b/pkgs/by-name/pe/perses/package.nix index 1682b11683df..88712fdce7c6 100644 --- a/pkgs/by-name/pe/perses/package.nix +++ b/pkgs/by-name/pe/perses/package.nix @@ -25,13 +25,13 @@ let in buildGoModule (finalAttrs: { pname = "perses"; - version = "0.51.0-rc.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "perses"; repo = "perses"; tag = "v${finalAttrs.version}"; - hash = "sha256-ts/GqBASja+IbZAKWMtExeVyFs6Q76iI9o6AKWZlp9Y="; + hash = "sha256-frCSuGEnYab4CTQoAuN876dG7Mwn/RJEnWouUuo7aJQ="; }; outputs = [ @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { inherit (finalAttrs) version src; pname = "${finalAttrs.pname}-ui"; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-a3bkk8IDfxi5nbRqu4WgYZ9bDr5my11HV4a72THclNw="; + hash = "sha256-nRE4IV8+wCuYXNAxrl7RfBFdY/ZyAIpXs3pDfCeIh74="; }; npmRoot = "ui"; @@ -59,7 +59,7 @@ buildGoModule (finalAttrs: { preBuild = null; }; - vendorHash = "sha256-DJAWmeuRPA2pII2RQZNF37n/QNmw2wDUtDpATMqkSJ8="; + vendorHash = "sha256-FfT3z48JaOiUTsVMmcbJdFJesO7cIMkYt/0gQ0jHh8I="; ldflags = [ "-s" @@ -77,12 +77,6 @@ buildGoModule (finalAttrs: { "cmd/perses" ]; - patches = [ - # This patch allows to override the default config paths using linker constants above - # See https://github.com/perses/perses/issues/2947 - ./plugin-path-config.patch - ]; - prePatch = '' patchShebangs . ''; diff --git a/pkgs/by-name/pe/perses/plugin-path-config.patch b/pkgs/by-name/pe/perses/plugin-path-config.patch deleted file mode 100644 index ab54855c02f7..000000000000 --- a/pkgs/by-name/pe/perses/plugin-path-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/model/api/config/plugin.go b/pkg/model/api/config/plugin.go -index 9ece1ced..603c6b0b 100644 ---- a/pkg/model/api/config/plugin.go -+++ b/pkg/model/api/config/plugin.go -@@ -17,7 +17,7 @@ import ( - "os" - ) - --const ( -+var ( - DefaultPluginPath = "plugins" - DefaultPluginPathInContainer = "/etc/perses/plugins" - DefaultArchivePluginPath = "plugins-archive" diff --git a/pkgs/by-name/pe/perses/plugins.nix b/pkgs/by-name/pe/perses/plugins.nix index 7d185e160554..07aba9f0710b 100644 --- a/pkgs/by-name/pe/perses/plugins.nix +++ b/pkgs/by-name/pe/perses/plugins.nix @@ -2,78 +2,88 @@ # Do not edit this file manually. { "BarChart" = { - version = "0.6.1"; - url = "https://github.com/perses/plugins/releases/download/barchart/v0.6.1/BarChart-0.6.1.tar.gz"; - hash = "sha256-A5p46sZfzzS6ss3wNJFTyI8N4YAPVev5+rmakbM1n1g="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/barchart/v0.8.0/BarChart-0.8.0.tar.gz"; + hash = "sha256-YXTQyn/BN9pbhIlFZoNkiIPvmFopkJdu0LHTnBAPcWM="; + }; + "DatasourceVariable" = { + version = "0.2.0"; + url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.2.0/DatasourceVariable-0.2.0.tar.gz"; + hash = "sha256-QqdikGca2ufzQ2CvXn9ThU+2ShM7twsoL6OweMs1ocw="; }; "GaugeChart" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.6.0/GaugeChart-0.6.0.tar.gz"; - hash = "sha256-Ug/GzdlRZjIbio72F/fWquIkg7xqTLf5y1gW9IoXl7g="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.8.0/GaugeChart-0.8.0.tar.gz"; + hash = "sha256-vWqZZZBOq87tz01ZezdODvFOBFIU9mOfgUE5N01zcvw="; + }; + "HistogramChart" = { + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.8.0/HistogramChart-0.8.0.tar.gz"; + hash = "sha256-BiBC4CgAn1JcS8dH9qv0nNYxx+Nte5ifvdrzO9yM+QA="; }; "Markdown" = { - version = "0.7.0"; - url = "https://github.com/perses/plugins/releases/download/markdown/v0.7.0/Markdown-0.7.0.tar.gz"; - hash = "sha256-KGlmEMUirjbwvirIT5Alt6Rsxk/2TIxspa2ikG6AJ7Y="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/markdown/v0.8.0/Markdown-0.8.0.tar.gz"; + hash = "sha256-L6bNqNp/agaV1N2Htdv072df5qUUkYexr/KKsDLOWW8="; }; "PieChart" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/piechart/v0.6.0/PieChart-0.6.0.tar.gz"; - hash = "sha256-AseYkh7Vl1TQJbOPwuMmCvKQls79fIQHQb7Gq6yZIUE="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/piechart/v0.8.0/PieChart-0.8.0.tar.gz"; + hash = "sha256-hp4IUDit0GgIqFKcVlf53FFBWDjbQPY0hYmsUTGKmkw="; }; "Prometheus" = { - version = "0.51.0-beta.2"; - url = "https://github.com/perses/plugins/releases/download/prometheus/v0.51.0-beta.2/Prometheus-0.51.0-beta.2.tar.gz"; - hash = "sha256-PUsaZyycDDNaIIhBPIjxnucij9yYZP2TxsX2GvqUTVo="; + version = "0.51.0-rc.3"; + url = "https://github.com/perses/plugins/releases/download/prometheus/v0.51.0-rc.3/Prometheus-0.51.0-rc.3.tar.gz"; + hash = "sha256-DqiYuZmWaxMzoKr0/IqciyxwOi8xf65lehwed8iCiJc="; }; "ScatterChart" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.6.0/ScatterChart-0.6.0.tar.gz"; - hash = "sha256-M1g/EWL5P/jSeTYMGTShuD+AavqK9vJkLeOjYX+dP3c="; + version = "0.7.0"; + url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.7.0/ScatterChart-0.7.0.tar.gz"; + hash = "sha256-OaX1q4Iy4x4IYVKL2aBYYQnNaHfjGiSrI+s3ZyzDfFI="; }; "StatChart" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/statchart/v0.6.0/StatChart-0.6.0.tar.gz"; - hash = "sha256-lxT2Zimo62i6dLR01uuEgcYs55LLlqyuXIv0DGZlAaM="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/statchart/v0.8.0/StatChart-0.8.0.tar.gz"; + hash = "sha256-K6zCZ0C2Y7kTQYXYxGdBPn2pB9DzMYgn15rEwJYkt5k="; }; "StaticListVariable" = { - version = "0.3.0"; - url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.3.0/StaticListVariable-0.3.0.tar.gz"; - hash = "sha256-1PmMDuWIq7ALV8DqqL+XJilkfGV2qXVOy9ZMTQrzRq8="; + version = "0.4.0"; + url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.4.0/StaticListVariable-0.4.0.tar.gz"; + hash = "sha256-tuygC5ipfGe2KpsuHS+aaI+avCIQpfAUC+kubk+/ULs="; }; "StatusHistoryChart" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.6.0/StatusHistoryChart-0.6.0.tar.gz"; - hash = "sha256-+U5IIZME3FXACIh3S725tuCdbTzlVRUrU9LFSldnMiI="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.8.0/StatusHistoryChart-0.8.0.tar.gz"; + hash = "sha256-61k3G+8bCsUErBCwvFxgnYCPLAqpCIcuF3GEZHacMB0="; }; "Table" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/table/v0.6.0/Table-0.6.0.tar.gz"; - hash = "sha256-pndqD5lrwXe66GiaC+NQgFJiaSJasldpmgwrnEAFmJU="; + version = "0.7.0"; + url = "https://github.com/perses/plugins/releases/download/table/v0.7.0/Table-0.7.0.tar.gz"; + hash = "sha256-MemCUd/9RhodqMzDuYCNPYDMaSy7LpVPCTP4IUFE3lM="; }; "Tempo" = { - version = "0.51.0-beta.2"; - url = "https://github.com/perses/plugins/releases/download/tempo/v0.51.0-beta.2/Tempo-0.51.0-beta.2.tar.gz"; - hash = "sha256-p1ey0we7ncsnoIcCNhlmzp3NRNrxtayTKruJCuR50gw="; + version = "0.51.0-rc.3"; + url = "https://github.com/perses/plugins/releases/download/tempo/v0.51.0-rc.3/Tempo-0.51.0-rc.3.tar.gz"; + hash = "sha256-oy2jBdZzf86G8+6wFkFPKiOj2yyYpUD1nVSGwou9vxg="; }; "TimeSeriesChart" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.6.0/TimeSeriesChart-0.6.0.tar.gz"; - hash = "sha256-6inzw4W7lakhbmVDkrgA8uwI6MLiVuk1xbiy904y6Ig="; + version = "0.9.1"; + url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.9.1/TimeSeriesChart-0.9.1.tar.gz"; + hash = "sha256-07Fuj8Zem5xHMmScD9FFZRDTNNB994SyskFv3rzwFG0="; }; "TimeSeriesTable" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.6.0/TimeSeriesTable-0.6.0.tar.gz"; - hash = "sha256-bkVhkfRZXGgKZGrQ9crag92jFFiRxZaZOb/UyBTyWGM="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.8.0/TimeSeriesTable-0.8.0.tar.gz"; + hash = "sha256-GPvoiWWaoG+EgtdqjB8IeHy4+QjXV9PkGVvlBeBZe2M="; }; "TraceTable" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/tracetable/v0.6.0/TraceTable-0.6.0.tar.gz"; - hash = "sha256-u8/NW23rGX2sAyuVoL7pH1WFYOhcdMFlzE4qMvMBYgE="; + version = "0.7.0"; + url = "https://github.com/perses/plugins/releases/download/tracetable/v0.7.0/TraceTable-0.7.0.tar.gz"; + hash = "sha256-PeCR0Oe8V8dBQMjPtU6xo5hpZJIXXPyXPfOtAMp2CjU="; }; "TracingGanttChart" = { - version = "0.6.0"; - url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.6.0/TracingGanttChart-0.6.0.tar.gz"; - hash = "sha256-R1U/Uq5QPVQWBe24IKovRXCsCyuUmATBcnqxRuRD+Aw="; + version = "0.7.0"; + url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.7.0/TracingGanttChart-0.7.0.tar.gz"; + hash = "sha256-satiNlwzbHdgrHgfWs99lUCXt4tsKi/K2ON1/NNFyGU="; }; }