From 14320d56a15e67ae0635711449846204dc6b880d Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Fri, 7 Apr 2023 02:19:56 +0000 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/03b51fe8e459a946c4b88dcfb6446e45efb2c24e' (2023-03-04) → 'github:ryantm/agenix/e64961977f60388dd0b49572bb0fc453b871f896' (2023-03-31) • Updated input 'drv-parts': 'github:DavHau/drv-parts/ced8a52f62b0a94244713df2225c05c85b416110' (2023-03-30) → 'github:DavHau/drv-parts/e8c2ec1157dc1edb002989669a0dbd935f430201' (2023-04-05) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/3502ee99d6dade045bdeaf7b0cd8ec703484c25c' (2023-03-25) → 'github:hercules-ci/flake-parts/dcc36e45d054d7bb554c9cdab69093debd91a0b5' (2023-04-01) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/c47745ed440c80d35abae09b96b17009db2e6648' (2023-03-29) → 'github:hercules-ci/hercules-ci-agent/7f046e522aa3f37e3e9d0558869c056d4dff1ed6' (2023-04-02) • Updated input 'hercules-ci-agent/nixpkgs': 'github:NixOS/nixpkgs/9a6aabc4740790ef3bbb246b86d029ccf6759658' (2023-03-29) → 'github:NixOS/nixpkgs/c90c4025bb6e0c4eaf438128a3b2640314b1c58d' (2023-03-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/646930ff24273c6d91fb3ea37531261553043b50' (2023-03-30) → 'github:NixOS/nixpkgs/36adaa6aaa6b03e59102df0c1b12cdc3f23fd112' (2023-04-05) • Updated input 'repin-flake-utils': 'github:numtide/flake-utils/93a2b84fc4b70d9e089d029deacc3583435c2ed6' (2023-03-15) → 'github:numtide/flake-utils/411e8764155aa9354dbcd6d5faaeb97e9e3dce24' (2023-04-06) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index e4cd948..61c3059 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1677969766, - "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", + "lastModified": 1680281360, + "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=", "owner": "ryantm", "repo": "agenix", - "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", + "rev": "e64961977f60388dd0b49572bb0fc453b871f896", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1680172861, - "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "lastModified": 1680698112, + "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", "owner": "DavHau", "repo": "drv-parts", - "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1680111004, - "narHash": "sha256-ZQogvVfGuVGhBsEbbaJ2tx/0khhMuvt8LnEU4fFC/qw=", + "lastModified": 1680449544, + "narHash": "sha256-Vvf7JlX/wZFJNhCaB9QqmqQbhgmuZ2QRoMXgpPy/0B4=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "c47745ed440c80d35abae09b96b17009db2e6648", + "rev": "7f046e522aa3f37e3e9d0558869c056d4dff1ed6", "type": "github" }, "original": { @@ -457,11 +457,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680125544, - "narHash": "sha256-mlqo1r+TZUOuypWdrZHluxWL+E5WzXlUXNZ9Y0WLDFU=", + "lastModified": 1678293141, + "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a6aabc4740790ef3bbb246b86d029ccf6759658", + "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1680183455, - "narHash": "sha256-lhlRyEZE1CZ2B5h4goEbS3Env7G6ORojj0/+AAGOooM=", + "lastModified": 1680724564, + "narHash": "sha256-eeUUGOTKTelYKDbUxKs0V7GUa186L2fym7jM2QQ4Oss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "646930ff24273c6d91fb3ea37531261553043b50", + "rev": "36adaa6aaa6b03e59102df0c1b12cdc3f23fd112", "type": "github" }, "original": { @@ -547,11 +547,11 @@ }, "repin-flake-utils": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1680776469, + "narHash": "sha256-3CXUDK/3q/kieWtdsYpDOBJw3Gw4Af6x+2EiSnIkNQw=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "411e8764155aa9354dbcd6d5faaeb97e9e3dce24", "type": "github" }, "original": { From f53181d03697e2b70ca7cfec9c60453c745b7417 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 12 Apr 2023 20:24:46 +0200 Subject: [PATCH 2/2] packages/grafana: 9.3.6 -> 9.4.7 --- packages/monitoring/grafana/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/monitoring/grafana/default.nix b/packages/monitoring/grafana/default.nix index ddca160..b3162a4 100644 --- a/packages/monitoring/grafana/default.nix +++ b/packages/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.3.6"; + version = "9.4.7"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-7t30AvGtCyU02fOYWHYcMWgcnmkepUpZzUMR4NjIlvw="; + sha256 = "sha256-vhGFZjxO20M3fQhXlEDDkad/yOyFOu48sHZ63MEnWIA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-jRUPrb6ocqux4SrMm/Hw/2DuG7sj2jKhSln16ynjHwM="; + sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0="; }; - vendorSha256 = "sha256-uGJ3D14qAvDkBUIlNxF1pCHMDYeuUoM8tPWfoEvA5o4="; + vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM="; nativeBuildInputs = [ wire ]; @@ -28,8 +28,14 @@ buildGoModule rec { wire gen -tags oss ./pkg/server wire gen -tags oss ./pkg/cmd/grafana-cli/runner - go generate ./pkg/framework/coremodel - go generate ./public/app/plugins + GOARCH= CGO_ENABLED=0 go generate ./pkg/plugins/plugindef + GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go + GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go + GOARCH= CGO_ENABLED=0 go generate ./pkg/kindsys/report.go + + # Work around `main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/pkg/util/xorm`. + # Apparently these files confuse the dependency resolution for the go builder implemented here. + rm pkg/util/xorm/go.{mod,sum} # The testcase makes an API call against grafana.com: #