Merge pull request #79356 from bbigras/mtail

mtail: 3.0.0-rc4 -> 3.0.0-rc34
This commit is contained in:
Niklas Hambüchen 2020-03-18 03:57:31 +01:00 committed by GitHub
commit 4366606c1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 78 deletions

@ -1,22 +1,26 @@
{ lib, fetchFromGitHub, gotools, buildGoPackage }:
{ lib, fetchFromGitHub, buildGoModule }:
buildGoPackage rec {
buildGoModule rec {
pname = "mtail";
version = "3.0.0-rc4";
goPackagePath = "github.com/google/mtail";
version = "3.0.0-rc35";
src = fetchFromGitHub {
owner = "google";
repo = "mtail";
rev = "v${version}";
sha256 = "1n7pqvid48ayn15qfpgpbsx0iqg24x08wphzpc08mlfw47gq7jg3";
sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd";
};
buildInputs = [ gotools ];
goDeps = ./deps.nix;
patches = [ ./fix-gopath.patch ];
preBuild = "go generate -x ./go/src/github.com/google/mtail/vm/";
modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi";
subPackages = [ "cmd/mtail" ];
preBuild = ''
go generate -x ./internal/vm/
'';
buildFlagsArray = [
"-ldflags=-X main.Version=${version}"
];
meta = with lib; {
license = licenses.asl20;

@ -1,56 +0,0 @@
[
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";
};
}
]

@ -1,13 +0,0 @@
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