Unverified Commit 1412caf7 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

grafana-alloy: 1.11.3 -> 1.12.1 (#477910)

parents 4b82cb5b 980aed79

pkgs/by-name/gr/grafana-alloy/package.nix

+35 −43
Original line number Diff line number Diff line
@@ -2,12 +2,10 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchYarnDeps,

  fetchNpmDeps,

  buildGoModule,

  buildNpmPackage,

  systemd,

  yarn,

  fixup-yarn-lock,

  nodejs,

  grafana-alloy,

  nixosTests,

  nix-update-script,
@@ -17,24 +15,42 @@ 
  useLLD ? stdenv.hostPlatform.isArmv7,

}:



buildGoModule (finalAttrs: {

buildGoModule (finalAttrs: rec {

  pname = "grafana-alloy";

  version = "1.11.3";



  version = "1.12.2";

  src = fetchFromGitHub {

    owner = "grafana";

    repo = "alloy";

    tag = "v${finalAttrs.version}";

    hash = "sha256-yO1r7GLXlD7f5Fpooit7SwkB7EB1hDO42o3BLvWY8Qo=";

    hash = "sha256-C/yqsUjEwKnGRkxMOQkKfGdeERbvO/e7D7c3CyJ+cVY=";

  };



  npmDeps = fetchNpmDeps {

    src = "${finalAttrs.src}/internal/web/ui";

    hash = "sha256-3J1Slka5bi+72NUaHBmDTtG1faJWRkOlkClKnUyiUsk=";

  };



  frontend = buildNpmPackage {

    pname = "alloy-frontend";

    inherit version src;



    inherit npmDeps;

    sourceRoot = "${src.name}/internal/web/ui";



    installPhase = ''

      runHook preInstall



      mkdir $out

      cp -av dist $out/share



      runHook postInstall

    '';

  };



  proxyVendor = true;

  vendorHash = "sha256-8n1r2Wun5ZSvjsU2Vl/fSRoQnTfKbrcQI6a7YDX/HZA=";

  vendorHash = "sha256-Bq/6ld2LldSDhksNqGMHXZAeNHh74D07o2ETpQqMcP4=";



  nativeBuildInputs = [

    fixup-yarn-lock

    yarn

    nodejs

    installShellFiles

  ]

  ++ lib.optionals useLLD [ lld ];
@@ -62,39 +78,15 @@ buildGoModule (finalAttrs: { 
    "promtail_journal_enabled"

  ];



  patchPhase = ''

    # Copy frontend build in

    cp -va "${frontend}/share" "internal/web/ui/dist"

  '';



  subPackages = [

    "."

  ];



  # Skip building the frontend in the goModules FOD

  overrideModAttrs = (

    _: {

      preBuild = null;

    }

  );



  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${finalAttrs.src}/internal/web/ui/yarn.lock";

    hash = "sha256-oCDP2XJczLXgzEjyvFEIFBanlnzjrj0So09izG5vufs=";

  };



  preBuild = ''

    pushd internal/web/ui



    # Yarn wants a real home directory to write cache, config, etc to

    export HOME=$NIX_BUILD_TOP/fake_home



    fixup-yarn-lock yarn.lock

    yarn config --offline set yarn-offline-mirror ${finalAttrs.yarnOfflineCache}

    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive



    patchShebangs node_modules/



    yarn --offline build



    popd

  '';



  # uses go-systemd, which uses libsystemd headers

  # https://github.com/coreos/go-systemd/issues/351

  NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isLinux [
@@ -138,8 +130,8 @@ buildGoModule (finalAttrs: { 
        "v(.+)"

      ];

    };

    # alias for nix-update to be able to find and update this attribute

    offlineCache = finalAttrs.yarnOfflineCache;

    # for nix-update to be able to find and update the hash

    inherit npmDeps;

  };



  meta = {