From 900a279015f612f11c47eefe74eb0e315317030e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 12 Jul 2024 07:58:10 +0200
Subject: [PATCH] Revert "flake: pin buildbot"
This reverts commit 57e60f4da8b26699fb8e1593c4b09d5d56bdfff9.
---
flake.lock | 7 +++----
flake.nix | 2 +-
modules/nixos/buildbot.nix | 1 +
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/flake.lock b/flake.lock
index 9c99570..55dec0e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,17 +42,16 @@
]
},
"locked": {
- "lastModified": 1720248892,
- "narHash": "sha256-r6HiSdc2IhKfKoSixH5fBMx8hWO/eoSUJJM71aeDbkE=",
+ "lastModified": 1720763748,
+ "narHash": "sha256-KHNUflFH8edFy6I6Jog+1MNeuMiMuSxqui4MNYihOEc=",
"owner": "nix-community",
"repo": "buildbot-nix",
- "rev": "d1d3746aa7111f0f8bb2e48d5da9995356170249",
+ "rev": "d6ae979a91084883791d1fb9ef90ca7599247ffa",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "buildbot-nix",
- "rev": "d1d3746aa7111f0f8bb2e48d5da9995356170249",
"type": "github"
}
},
diff --git a/flake.nix b/flake.nix
index 6a134cd..437784c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
buildbot-nix.inputs.flake-parts.follows = "flake-parts";
buildbot-nix.inputs.nixpkgs.follows = "nixpkgs";
buildbot-nix.inputs.treefmt-nix.follows = "treefmt-nix";
- buildbot-nix.url = "github:nix-community/buildbot-nix/d1d3746aa7111f0f8bb2e48d5da9995356170249";
+ buildbot-nix.url = "github:nix-community/buildbot-nix";
comin.inputs.nixpkgs.follows = "nixpkgs";
comin.url = "github:nlewo/comin/d3658c452024824235de2355ac3e156b10c3eaaf";
disko.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/nixos/buildbot.nix b/modules/nixos/buildbot.nix
index 8dab56c..a799d53 100644
--- a/modules/nixos/buildbot.nix
+++ b/modules/nixos/buildbot.nix
@@ -24,6 +24,7 @@
enable = true;
admins = [ "adisbladis" "ryantm" "zimbatm" "zowoq" ];
buildSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ buildRetries = 0;
domain = "buildbot.nix-community.org";
evalMaxMemorySize = "4096";
evalWorkerCount = 16;