grafana-alloy: 1.14.2 -> 1.15.1 (#507328)
This commit is contained in:
@@ -13,20 +13,25 @@
|
||||
lld,
|
||||
useLLD ? stdenv.hostPlatform.isArmv7,
|
||||
}:
|
||||
|
||||
let
|
||||
beylaVersion = "v3.6.0";
|
||||
in
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-alloy";
|
||||
version = "1.14.2";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "alloy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-77WMsnC2WgVnbw1BsCj9ayS6XPsVTghmtIyl9Dk71uY=";
|
||||
hash = "sha256-dAWBmvrthnsji6WuM2itRdfV4ONKDjsCzUJkUSmb1XI=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/internal/web/ui";
|
||||
hash = "sha256-MiHFeyDxLzYF3t9H8OEn/bL10WRbzMcwlENs2FSJ4xo=";
|
||||
hash = "sha256-YUCft67WskKubZu8qEIUoH5NHwSfD5o0tWzyply90Zg=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
@@ -49,12 +54,18 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
patchPhase = ''
|
||||
cp -av ${finalAttrs.frontend}/share internal/web/ui/dist
|
||||
|
||||
goSumBeylaVersion="$(grep beyla go.sum | head -1 | cut -d ' ' -f2)"
|
||||
if [[ "$goSumBeylaVersion" != "${beylaVersion}" ]];then
|
||||
echo "beyla version in go.sum ($goSumBeylaVersion) doesn't match the one set in the expression (${beylaVersion}), needs updating."
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
modRoot = "collector";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-i/BV987/ZYnCRYX8m9iFdtPo0vrWsmpn6UDs0q59sMM=";
|
||||
vendorHash = "sha256-PbaqxDJHXB1MT5KtiEIkl+gP0DolzlC5JRItGC5VCpQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -66,6 +77,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/grafana/alloy/internal/build.Revision=v${finalAttrs.version}"
|
||||
"-X github.com/grafana/alloy/internal/build.BuildUser=nix@nixpkgs"
|
||||
"-X github.com/grafana/alloy/internal/build.BuildDate=1970-01-01T00:00:00Z"
|
||||
"-X github.com/grafana/beyla/pkg/buildinfo=${beylaVersion}"
|
||||
];
|
||||
|
||||
tags = [
|
||||
|
||||
Reference in New Issue
Block a user