Skip to content

Lock file maintenance #1164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mweinelt merged 5 commits into from
Aug 3, 2026
Merged

Lock file maintenance #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73a8fa1
Lock file maintenance
renovate[bot] Aug 3, 2026
fcdbdc8
Migrate hydra-queue-builder options into settings
mweinelt Aug 3, 2026
3412833
freescout: consume from nixpkgs
mweinelt Aug 3, 2026
4774cbf
Track nix-fast-build from git upstream
mweinelt Aug 3, 2026
c19c72f
Track nixpkgs-26.05-darwin for nix-darwin
mweinelt Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached
nixos-x86_64:
runs-on: ubuntu-latest
strategy:
Expand All @@ -55,7 +55,7 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached --flake '.#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
nixos-aarch64:
runs-on: ubuntu-24.04-arm
strategy:
Expand All @@ -74,7 +74,7 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached --flake '.#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
# ofborg machines share most of their closure, so build all of one arch in a
# single job to reuse the store between them.
nixos-ofborg-x86_64:
Expand All @@ -89,7 +89,7 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#ciSystems.ofborg-x86_64-linux'
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached --flake '.#ciSystems.ofborg-x86_64-linux'
nixos-ofborg-aarch64:
name: NixOS ofborg (aarch64)
runs-on: ubuntu-24.04-arm
Expand All @@ -102,7 +102,7 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#ciSystems.ofborg-aarch64-linux'
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached --flake '.#ciSystems.ofborg-aarch64-linux'
nix-darwin-ofborg:
name: nix-darwin ofborg (aarch64)
runs-on: macos-latest
Expand All @@ -115,7 +115,7 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#ciSystems.ofborg-aarch64-darwin'
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached --flake '.#ciSystems.ofborg-aarch64-darwin'
nix-darwin-ofborg-x86_64:
name: nix-darwin ofborg (x86_64)
runs-on: macos-26-intel
Expand All @@ -128,7 +128,7 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#ciSystems.ofborg-x86_64-darwin'
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached --flake '.#ciSystems.ofborg-x86_64-darwin'
nix-darwin:
runs-on: macos-latest
strategy:
Expand All @@ -146,4 +146,4 @@ jobs:
with:
name: nixos-infra-dev
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix run --inputs-from . nixpkgs#nix-fast-build -- --skip-cached --no-nom --flake '.#darwinConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
- run: nix run --inputs-from . nix-fast-build#nix-fast-build -- --skip-cached --flake '.#darwinConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
18 changes: 10 additions & 8 deletions builders/common/hydra-queue-builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
enable = true;
queueRunnerAddr = "https://queue-runner.hydra.nixos.org";
authorizationFile = config.age.secrets."queue-runner-token".path;
maxJobs = config.nix.settings.max-jobs;
# Required for presigned uploads: builders fetch dependencies via
# substitution and upload results to s3 directly.
useSubstitutes = true;
# Align this with what our GC settings
storeAvailThreshold = 5.0;
# Tolerate only minimal contention before we stop scheduling new jobs
cpuPsiThreshold = 15.0;
settings = {
maxJobs = config.nix.settings.max-jobs;
# Required for presigned uploads: builders fetch dependencies via
# substitution and upload results to s3 directly.
useSubstitutes = true;
# Align this with what our GC settings
storeAvailThreshold = 5.0;
# Tolerate only minimal contention before we stop scheduling new jobs
cpuPsiThreshold = 15.0;
};
};
}
6 changes: 3 additions & 3 deletions builders/instances/elated-minsky.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
max-jobs = 48;
};

services.hydra-queue-builder-dev.supportedFeatures = lib.filter (feat: feat != "big-parallel") (
with config.nix.settings; system-features ++ extra-system-features
);
services.hydra-queue-builder-dev.settings.supportedFeatures = lib.filter (
feat: feat != "big-parallel"
) (with config.nix.settings; system-features ++ extra-system-features);

networking = {
hostName = "elated-minsky";
Expand Down
6 changes: 3 additions & 3 deletions builders/instances/goofy-hopcroft.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
max-jobs = 40;
};

services.hydra-queue-builder-dev.supportedFeatures = lib.filter (feat: feat != "big-parallel") (
with config.nix.settings; system-features ++ extra-system-features
);
services.hydra-queue-builder-dev.settings.supportedFeatures = lib.filter (
feat: feat != "big-parallel"
) (with config.nix.settings; system-features ++ extra-system-features);

networking = {
hostName = "goofy-hopcroft";
Expand Down
2 changes: 1 addition & 1 deletion builders/instances/hopeful-rivest.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
max-jobs = 3;
};

services.hydra-queue-builder-dev.mandatoryFeatures = [ "big-parallel" ];
services.hydra-queue-builder-dev.settings.mandatoryFeatures = [ "big-parallel" ];

networking = {
hostName = "hopeful-rivest";
Expand Down
2 changes: 1 addition & 1 deletion builders/instances/sleepy-brown.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
max-jobs = 4;
};

services.hydra-queue-builder-dev.supportedFeatures = [ "big-parallel" ];
services.hydra-queue-builder-dev.settings.supportedFeatures = [ "big-parallel" ];

networking = {
hostName = "sleepy-brown";
Expand Down
Loading