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

prometheus: 2.14.0 -> 2.15.2 (#79400)

This commit is contained in:
Sergey Lukjanov 2020-02-06 18:36:39 -08:00 committed by GitHub
parent 08decd7ada
commit 4965950365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,13 @@
{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }:
let let
version = "2.14.0"; version = "2.15.2";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "prometheus"; owner = "prometheus";
repo = "prometheus"; repo = "prometheus";
sha256 = "0zmxj78h3cnqbhsqab940hyzpim5i9r81b15a57f3dnrrd10p287"; sha256 = "0gl11qqbq57vkx226n8z4x07fwvly5f21y6dn20kjh2fxigmrb2n";
}; };
webui = mkYarnPackage { webui = mkYarnPackage {
@ -59,12 +59,6 @@ in buildGoPackage rec {
cp -a $src/console_libraries $src/consoles $bin/etc/prometheus cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
''; '';
# Disable module-mode, because Go 1.13 automatically enables it if there is
# go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380
preCheck = ''
export GO111MODULE=off
'';
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {

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

@ -11074,11 +11074,11 @@
}; };
} }
{ {
name = "typescript___typescript_3.6.4.tgz"; name = "typescript___typescript_3.7.2.tgz";
path = fetchurl { path = fetchurl {
name = "typescript___typescript_3.6.4.tgz"; name = "typescript___typescript_3.7.2.tgz";
url = "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz"; url = "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz";
sha1 = "b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"; sha1 = "27e489b95fa5909445e9fef5ee48d81697ad18fb";
}; };
} }
{ {