From 2cec46f9cc5157480eba0f669c6bea5f85d0bf4e Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 14 Dec 2024 16:35:03 +0100 Subject: [PATCH 1/2] chore: add metrics-reporter-prometheus to flake.nix This way, it's easy to test it over a fixed nixpkgs version. Signed-off-by: Raito Bezarius --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c4d0f57..5618853 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ in { default = pkgSet.gerrit; inherit (pkgSet) gerrit; - inherit (pkgSet.plugins) oauth code-owners; + inherit (pkgSet.plugins) oauth code-owners metrics-reporter-prometheus; }); devShells = forAllSystems (system: { -- 2.47.0 From 2657389c594976b270bb1352b1241e0644a417c9 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 14 Dec 2024 16:26:02 +0100 Subject: [PATCH 2/2] chore: upgrade nixpkgs This requires a bump for the dependency FOD of Gerrit 3.10 as well. Signed-off-by: Raito Bezarius --- flake.lock | 6 +++--- gerrit/default.nix | 2 +- plugins/metrics-reporter-prometheus/default.nix | 2 +- plugins/oauth/default.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ed5e17d..baa656b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { diff --git a/gerrit/default.nix b/gerrit/default.nix index d356ae2..87f620d 100644 --- a/gerrit/default.nix +++ b/gerrit/default.nix @@ -38,7 +38,7 @@ in find "$dir" -name .git -print0 | xargs -0 rm -rf ''; }); - depsHash = "sha256-mp2RhOvDh+0CeLQhCjPp57N2QB816k4AWMeAhvU2u38="; + depsHash = "sha256-eX26Bjm7GvzywYeew3705dIwM1ducJw3LsjEYPLn6AM="; patches = [ ./0001-Syntax-highlight-nix.patch diff --git a/plugins/metrics-reporter-prometheus/default.nix b/plugins/metrics-reporter-prometheus/default.nix index 4c80a11..d866a5c 100644 --- a/plugins/metrics-reporter-prometheus/default.nix +++ b/plugins/metrics-reporter-prometheus/default.nix @@ -11,7 +11,7 @@ buildGerritBazelPlugin rec { rev = "f2ee1de665281596ae300144243fcf94bf6f1f7d"; hash = "sha256-iUFzSXKIKBdZBZMpZiejkEEXXI20wTJQRYkufc/YjOM="; }; - depsHash = "sha256-hxnQlzzVQ15fyVo613FOsHlZZgOL1lBKOgqEGBoc7To="; + depsHash = "sha256-+X3d9KL3gR0RucJU4M8cq9Tnw9zyeVNdDWjzT6AndGM="; postOverlayPlugin = '' cp "${src}/external_plugin_deps.bzl" "$out/plugins/external_plugin_deps.bzl" ''; diff --git a/plugins/oauth/default.nix b/plugins/oauth/default.nix index 4b0f95a..e48ac66 100644 --- a/plugins/oauth/default.nix +++ b/plugins/oauth/default.nix @@ -11,7 +11,7 @@ buildGerritBazelPlugin rec { rev = "98231604d60788bb43490f1a301d792817ac8008"; hash = "sha256-AuVO1Yys8BYqGHZI/adszCUg0JM2v4Td4fe26LdOPLM="; }; - depsHash = "sha256-UjoGmNSyFx7NK4AUkk5oQbcJ/RpONbwwAlBgNnjXT+s="; + depsHash = "sha256-mWR7hGl0c2lBH1YvUv6vAJohAwqhvDJohv559ms6Mkw="; postOverlayPlugin = '' cp "${src}/external_plugin_deps.bzl" "$out/plugins/external_plugin_deps.bzl" ''; -- 2.47.0