Skip to content

Commit 43000fd

Browse files
committed
fix(spore): use lib.mkForce to override gc options from base module
The base gc.nix sets nix.gc.options; spore's override conflicted without mkForce. Also adds a fast eval-only CI job that checks all NixOS configurations evaluate before the full build runs, catching option conflicts like this at PR time.
1 parent 4d7ff2c commit 43000fd

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,23 @@ on:
66
branches: main
77

88
jobs:
9+
eval:
10+
name: Evaluate all configurations
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: cachix/install-nix-action@v31
15+
with:
16+
github_access_token: ${{ secrets.GITHUB_TOKEN }}
17+
- name: Check all NixOS configurations evaluate
18+
run: |
19+
for host in glyph spore zeta; do
20+
echo "Evaluating $host..."
21+
nix eval .#nixosConfigurations.$host.config.system.build.toplevel.drvPath
22+
done
23+
924
build:
25+
needs: eval
1026
strategy:
1127
fail-fast: false
1228
matrix:

‎hosts/spore/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252

5353
# Stricter GC due to limited disk space (30 GB)
5454
nix.gc = {
55-
dates = "daily";
56-
options = "--delete-older-than 7d";
55+
dates = lib.mkForce "daily";
56+
options = lib.mkForce "--delete-older-than 7d";
5757
};
5858

5959
nix.settings = {

0 commit comments

Comments
 (0)