diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-12-28 00:36:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-28 00:36:20 +0100 |
commit | fbbe4ad559071d43b37bc580520fdb67be0f630b (patch) | |
tree | 9968e400527e99d6dbb20723ba90f02494236ffd /pkgs/servers | |
parent | 6c1c442040df0f98dd9d3f3ead9deb44e5ea84cf (diff) | |
parent | d1efd653afa8d37fb821e806d03e0f92778d8fef (diff) | |
download | nixlib-fbbe4ad559071d43b37bc580520fdb67be0f630b.tar nixlib-fbbe4ad559071d43b37bc580520fdb67be0f630b.tar.gz nixlib-fbbe4ad559071d43b37bc580520fdb67be0f630b.tar.bz2 nixlib-fbbe4ad559071d43b37bc580520fdb67be0f630b.tar.lz nixlib-fbbe4ad559071d43b37bc580520fdb67be0f630b.tar.xz nixlib-fbbe4ad559071d43b37bc580520fdb67be0f630b.tar.zst nixlib-fbbe4ad559071d43b37bc580520fdb67be0f630b.zip |
Merge pull request #107554 from happysalada/grafana-loki-update
grafana-loki: 2.0.0 -> 2.1.0
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/monitoring/loki/default.nix | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index f1cefdc0b1d9..a3e85e2b822e 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,37 +1,21 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, nixosTests -, systemd -, fetchpatch +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, systemd }: buildGoModule rec { - version = "2.0.0"; + version = "2.1.0"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "09a0mqdmk754vigd1xqijzwazwrmfaqcgdr2c6dz25p7a65568hj"; + sha256 = "O/3079a67j1i9pgf18SBx0iJcQPVmb0H+K/PzQVBCDQ="; }; vendorSha256 = null; subPackages = [ "..." ]; - patches = [ - (fetchpatch { - # Fix expected return value in Test_validateDropConfig - # https://github.com/grafana/loki/issues/2519 - url = "https://github.com/grafana/loki/commit/1316c0f0c5cda7c272c4873ea910211476fc1db8.patch"; - sha256 = "06hwga58qpmivbhyjgyqzb75602hy8212a4b5vh99y9pnn6c913h"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; |