Loading
+1 −1
Original line number Diff line number Diff line
@@ -2091,7 +2091,7 @@ in
        set -o errexit -o pipefail -o nounset -o errtrace
        shopt -s inherit_errexit

        exec ${cfg.package}/bin/grafana server -homepath ${cfg.dataDir} -config ${configFile}
        exec ${lib.getExe cfg.package} server -homepath ${cfg.dataDir} -config ${configFile}
      '';
      serviceConfig = {
        WorkingDirectory = cfg.dataDir;
+55 −60

File changed.

Preview size limit exceeded, changes collapsed.

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@

buildGoModule (finalAttrs: {
  pname = "grafana";
  version = "12.4.2";
  version = "13.0.1";

  subPackages = [
    "pkg/cmd/grafana"
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
    owner = "grafana";
    repo = "grafana";
    rev = "v${finalAttrs.version}";
    hash = "sha256-cA+SLXry+aomj3O7ShiVOCkZVMk0XLq6EmYuOfi+hyk=";
    hash = "sha256-fGRvCDIOQcF743SimatyNmX0gZtO0tvgEAFuk38rl88=";
  };

  # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -49,12 +49,12 @@ buildGoModule (finalAttrs: {
  # Since this is not a dependency attribute the buildPackages has to be specified.
  offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
    inherit (finalAttrs) src missingHashes;
    hash = "sha256-dbYgn1hB3xe5KCFyLwO1Xe6YJ2vPl9xymnx4i42J0Dc=";
    hash = "sha256-5aInVAn9UMGp8U+LEIR1D19RI9vKVrNpt5Frbr1sBJs=";
  };

  disallowedRequisites = [ finalAttrs.offlineCache ];

  vendorHash = "sha256-q+AFeXM1NQB4WVGiahiVRiXAhLNMa/H9IL3kv6Ybl+M=";
  vendorHash = "sha256-PEGgrkTguHvqrclzvZDQ7yk6rwTKDLXdUSjeaQFnYtU=";

  # Grafana seems to just set it to the latest version available
  # nowadays.
@@ -172,6 +172,6 @@ buildGoModule (finalAttrs: {
      "aarch64-darwin"
      "riscv64-linux"
    ];
    mainProgram = "grafana-server";
    mainProgram = "grafana";
  };
})