From bd8aa2eb082839301fc33755aa53ae5260fa3b4e Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Thu, 25 Jul 2024 23:35:06 +0200 Subject: [PATCH] =?UTF-8?q?gerrit01:=20adjustments=20for=20master=20?= =?UTF-8?q?=E2=86=92=20main=20OWS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to rename, we need a `mkNixpkgsJob` slightly more complicated. Signed-off-by: Raito Bezarius --- hosts/gerrit01/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/gerrit01/default.nix b/hosts/gerrit01/default.nix index 6a95fc2..5527fb6 100755 --- a/hosts/gerrit01/default.nix +++ b/hosts/gerrit01/default.nix @@ -47,11 +47,11 @@ }; bagel.nixpkgs.one-way-sync = let - mkNixpkgsJob = { timer, branchName }: { + mkNixpkgsJob = { timer, branchName, localRefspec ? null }: { name = "nixpkgs-${branchName}"; fromUri = "https://github.com/NixOS/nixpkgs"; fromRefspec = branchName; - localRefspec = branchName; + localRefspec = if localRefspec != null then localRefspec else branchName; inherit timer; }; in @@ -63,7 +63,8 @@ branches."refs/heads/main" = mkNixpkgsJob { timer = "hourly"; - branchName = "main"; + branchName = "master"; + localRefspec = "main"; }; branches."refs/heads/staging" = mkNixpkgsJob {