diff options
| author | Sergey Lukjanov <me@slukjanov.name> | 2020-02-06 18:36:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 21:36:39 -0500 |
| commit | 4965950365c8ff151d8eb9d14aa4dfb731c940e5 (patch) | |
| tree | a4de17a7119311da5b0501e484435c40eca823fd /pkgs/servers/monitoring | |
| parent | 08decd7ada3ce032d78a8b60b865d5a706818ed1 (diff) | |
| download | nixlib-4965950365c8ff151d8eb9d14aa4dfb731c940e5.tar nixlib-4965950365c8ff151d8eb9d14aa4dfb731c940e5.tar.gz nixlib-4965950365c8ff151d8eb9d14aa4dfb731c940e5.tar.bz2 nixlib-4965950365c8ff151d8eb9d14aa4dfb731c940e5.tar.lz nixlib-4965950365c8ff151d8eb9d14aa4dfb731c940e5.tar.xz nixlib-4965950365c8ff151d8eb9d14aa4dfb731c940e5.tar.zst nixlib-4965950365c8ff151d8eb9d14aa4dfb731c940e5.zip | |
prometheus: 2.14.0 -> 2.15.2 (#79400)
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/webui-yarndeps.nix | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index d772d9935bce..4a27b7ac049e 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.14.0"; + version = "2.15.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0zmxj78h3cnqbhsqab940hyzpim5i9r81b15a57f3dnrrd10p287"; + sha256 = "0gl11qqbq57vkx226n8z4x07fwvly5f21y6dn20kjh2fxigmrb2n"; }; webui = mkYarnPackage { @@ -59,12 +59,6 @@ in buildGoPackage rec { 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; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 3cc45a2f6913..1793b4a5c3f0 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -11074,11 +11074,11 @@ }; } { - name = "typescript___typescript_3.6.4.tgz"; + name = "typescript___typescript_3.7.2.tgz"; path = fetchurl { - name = "typescript___typescript_3.6.4.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz"; - sha1 = "b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"; + name = "typescript___typescript_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz"; + sha1 = "27e489b95fa5909445e9fef5ee48d81697ad18fb"; }; } { |