grafana: remove scripts/go to fix go 1.15 build failure
Using subPackages to avoid building this directory would be more idiomatic but then we would lose the majority of the go tests.
This commit is contained in:
parent
e2ba711bfa
commit
5837509c65
2 changed files with 7 additions and 3 deletions
|
@ -25,6 +25,12 @@ buildGoModule rec {
|
|||
--replace 'var version = "5.0.0"' 'var version = "${version}"'
|
||||
'';
|
||||
|
||||
# fixes build failure with go 1.15:
|
||||
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
|
||||
preBuild = ''
|
||||
rm -rf scripts/go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
tar -xvf $srcStatic
|
||||
mkdir -p $out/share/grafana
|
||||
|
|
|
@ -16503,9 +16503,7 @@ in
|
|||
|
||||
gofish = callPackage ../servers/gopher/gofish { };
|
||||
|
||||
grafana = callPackage ../servers/monitoring/grafana {
|
||||
buildGoModule = buildGo114Module;
|
||||
};
|
||||
grafana = callPackage ../servers/monitoring/grafana { };
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki {
|
||||
buildGoPackage = buildGo114Package;
|
||||
|
|
Loading…
Reference in a new issue