Merge pull request #31215 from BlessJah/mtail

Mtail
This commit is contained in:
Orivej Desh 2017-11-04 01:02:04 +00:00 committed by GitHub
commit dd443ad220
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 100 additions and 3 deletions

View file

@ -2,8 +2,8 @@
buildGoPackage rec {
name = "gotools-${version}";
version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
version = "20170807-${stdenv.lib.strings.substring 0 7 rev}";
rev = "5d2fd3ccab986d52112bf301d47a819783339d0e";
goPackagePath = "golang.org/x/tools";
goPackageAliases = [ "code.google.com/p/go.tools" ];
@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn";
};
goDeps = ./deps.nix;

View file

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, gotools, buildGoPackage }:
buildGoPackage rec {
name = "mtail-${version}";
version = "3.0.0-rc4";
goPackagePath = "github.com/google/mtail";
src = fetchFromGitHub {
owner = "google";
repo = "mtail";
rev = "v${version}";
sha256 = "1n7pqvid48ayn15qfpgpbsx0iqg24x08wphzpc08mlfw47gq7jg3";
};
buildInputs = [ gotools ];
goDeps = ./deps.nix;
patches = [ ./fix-gopath.patch ];
preBuild = "go generate -x ./go/src/github.com/google/mtail/vm/";
meta = with lib; {
license = licenses.asl20;
homepage = "https://github.com/google/mtail";
description = "Tool for extracting metrics from application logs";
};
}

View file

@ -0,0 +1,56 @@
[
rec {
goPackagePath = "github.com/golang/glog";
fetch = {
type = "git";
url = "https://${goPackagePath}.git";
rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
rec {
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://${goPackagePath}.git";
rev = "5660eeed305fe5f69c8fc6cf899132a459a97064";
sha256 = "0rpwvjp9xfmy2yvbmy810qamjhimr56zydvx7hb1gjn3b7jp4rhd";
};
}
rec {
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://${goPackagePath}.git";
rev = "v1.4.2";
sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
};
}
rec {
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://${goPackagePath}.git";
rev = "v0.8.0";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "95c6576299259db960f6c5b9b69ea52422860fce";
sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "3ba1a4dc141f5236b19ccbf2f67cb63d1a688d46";
sha256 = "07sbakmman41p5hmdbf4y2wak0gh7k1z88m0zb72acsypp4179h1";
};
}
]

View file

@ -0,0 +1,13 @@
diff --git a/vm/compiler.go b/vm/compiler.go
index c55266b..a46417c 100644
--- a/vm/compiler.go
+++ b/vm/compiler.go
@@ -2,7 +2,7 @@
// This file is available under the Apache license.
// Build the parser:
-//go:generate $GOPATH/bin/goyacc -v y.output -o parser.go -p mtail parser.y
+//go:generate goyacc -v y.output -o parser.go -p mtail parser.y
package vm

View file

@ -2971,6 +2971,8 @@ with pkgs;
mkcast = callPackage ../applications/video/mkcast { };
mtail = callPackage ../servers/monitoring/mtail { };
multitail = callPackage ../tools/misc/multitail { };
mxt-app = callPackage ../misc/mxt-app { };