JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prometheus: 2.22.2 -> 2.23.0

Browse Source 
ChangeLog: https://github.com/prometheus/prometheus/releases/tag/v2.23.0

* Applied a patch to fix a regression in release 2.23[1].

[1] https://github.com/prometheus/prometheus/issues/8144
This commit is contained in:
Maximilian Bosch 2020-12-23 13:09:41 +01:00
parent 39ebc637a1
commit 5a26fb3c98
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 741 additions and 683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: { stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests
, fetchpatch
}:
let let
version = "2.22.2"; version = "2.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "prometheus"; owner = "prometheus";
repo = "prometheus"; repo = "prometheus";
sha256 = "04pf3shdfd25wf8snkan5hzv1gjzazjw06i11xaamnc8gfahnzdv"; sha256 = "sha256-UQ1r8271EiZDU/h2zta6toMRfk2GjXol8GexYL9n+BE=";
}; };
webui = mkYarnPackage { webui = mkYarnPackage {
@ -29,6 +31,14 @@ in buildGoPackage rec {
goPackagePath = "github.com/prometheus/prometheus"; goPackagePath = "github.com/prometheus/prometheus";
patches = [
# Fix https://github.com/prometheus/prometheus/issues/8144
(fetchpatch {
url = "https://github.com/prometheus/prometheus/commit/8b64b70fe4a5aa2877c95aa12c6798b12d3ff7ec.patch";
sha256 = "sha256-RuXT5pBXv8z6WoE59KNGh+OXr1KGLGWs/n0Hjf4BuH8=";
})
];
postPatch = '' postPatch = ''
ln -s ${webui.node_modules} web/ui/react-app/node_modules ln -s ${webui.node_modules} web/ui/react-app/node_modules
ln -s ${webui} web/ui/static/react ln -s ${webui} web/ui/static/react

1408
pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
View File

File diff suppressed because it is too large Load Diff