diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2023-12-20 17:47:29 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2024-02-15 21:19:59 +0100 |
commit | af20886573fb3c5a58164058a71e8eb7a5bb6fbc (patch) | |
tree | 3e1019099609cb0ea1763b047137b8a63e4dbaa9 | |
parent | 0ca77ade2a34c5466be6d54f1267507860c95da8 (diff) |
grafana: 10.2.2 -> 10.2.3
ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.2.3 Changed `preBuild` to `postConfigure` since the latter is a hook that's only executed in the actual build, not in the gomod FoD. This is a dirty hack because apparently the removal of `pkg/util/xorm/go.{mod,sum}` breaks the module download now, but not removing it breaks the build later (as documented in the comment above). A nice side-effect is that we don't do all the `go generate`/`wire` invocations twice per build. (cherry picked from commit 3eb45a22ca8795b9ef2e9805a5070908fd5f0098)
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 0ccde0228c7df..859aee37ccfbf 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "10.2.2"; + version = "10.2.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; @@ -10,19 +10,19 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-MlrGBa/ZQwfETr5vt7CyJxtvZC021aeWsgKtfuc8wAc="; + hash = "sha256-F61RtPEjQ4uFVcJLG04CD4//w8X7uJinxzYyoW/MosA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-Mt0si5TxkXGQp5vmVD37fl3WKXuuIcJNtiTcEYCroZ8="; + hash = "sha256-xoZgaml1SB9PEI3kTE3zRlJR5O4tog58bua2blvc8to="; }; - vendorHash = "sha256-z2eDbnezG9TWrqLPxAXHBgdtXvaEf8ccUQUe9MnhjtQ="; + vendorHash = "sha256-rQOnuh6t+cUqyAAnUhGgxMaW88pawnauAGQd6w0T57Q="; nativeBuildInputs = [ wire ]; - preBuild = '' + postConfigure = '' # Generate DI code that's required to compile the package. # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 wire gen -tags oss ./pkg/server |