Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@ jobs:
eval_host() {
local host="$1"
local expr="$2"
local rc=0
echo "Evaluating $host..."
stderr=$(nix eval "$expr" 2>&1 >/dev/null)
stderr=$(nix eval "$expr" 2>&1 >/dev/null) || rc=$?
if [ -n "$stderr" ]; then
echo "$stderr"
if echo "$stderr" | grep -q "evaluation warning:"; then
encoded=$(printf '%s' "$stderr" | python3 -c "import sys; print(sys.stdin.read().replace('%','%25').replace('\n','%0A').replace('\r','%0D'))")
echo "::warning title=Evaluation warnings ($host)::${encoded}"
fi
fi
return $rc
}
for host in glyph spore zeta; do
eval_host "$host" ".#nixosConfigurations.$host.config.system.build.toplevel.drvPath"
Expand Down
140 changes: 66 additions & 74 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
};
attic = {
url = "github:zhaofengli/attic";
inputs.nixpkgs.follows = "nixpkgs";
};
zx-dev = {
url = "github:stackptr/zx.dev";
Expand Down Expand Up @@ -202,6 +201,7 @@
config.allowUnfreePredicate = pkg:
builtins.elem (inputs.nixpkgs.lib.getName pkg) [
"graphite-cli"
"graphite-cli-unwrapped"
"obsidian-headless"
];
};
Expand Down
1 change: 1 addition & 0 deletions modules/base/unfree-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"daisydisk"
"fastscripts"
"graphite-cli"
"graphite-cli-unwrapped"
"mochi"
"obsidian-headless"
"open-webui"
Expand Down
4 changes: 2 additions & 2 deletions overlays/daisydisk.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
self: super: {
daisydisk = super.daisydisk.overrideAttrs (old: {
version = "4.32";
version = "4.34.2";
src = super.fetchzip {
url = "https://daisydiskapp.com/download/DaisyDisk.zip";
hash = "sha256-2QhaY4oQV+bkvcyC88Zsk7eZJ6dySsb5G2+juH8HNjI=";
hash = "sha256-lSV367twsKDp0e5TsVYfjYO5GPcjtteBCxmUIOrz+0E=";
stripRoot = false;
};
});
Expand Down
3 changes: 3 additions & 0 deletions overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@

# Override opencode ahead of nixpkgs pin
(import ./opencode.nix)

# Skip paho-mqtt's flaky test suite (nixpkgs#542586)
(import ./paho-mqtt.nix)
]
18 changes: 18 additions & 0 deletions overlays/paho-mqtt.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# paho-mqtt's test suite is flaky on client/broker teardown timing and
# intermittently fails CI (different tests fail each run, not a real
# regression). Tracked upstream, unresolved as of writing:
# https://github.com/NixOS/nixpkgs/issues/542586
final: prev: {
pythonPackagesExtensions =
prev.pythonPackagesExtensions
++ [
(pyFinal: pyPrev: {
# Its checks run in installCheckPhase (pyproject-style builder), not
# checkPhase, so doCheck alone is a no-op here.
paho-mqtt = pyPrev.paho-mqtt.overrideAttrs (old: {
doCheck = false;
doInstallCheck = false;
});
})
];
}
Loading