DGNum/infrastructure
12
6
Fork 3
Code Issues 16 Pull requests 11 Projects 1 Releases Packages Wiki Activity Actions

fix(hive): ensure we are in hermetic evaluation

Browse source 
We don't want any <nixpkgs> to appear out of nowhere.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
This commit is contained in:
Ryan Lahfa 2024-12-08 15:15:29 +01:00 committed by Tom Hubrecht
parent 6ca347ee51
commit e94d6fd16e
Signed by: thubrecht
SSH key fingerprint: SHA256:r+nK/SIcWlJ0zFZJGHtlAoRwq1Rm+WcKAm5ADYMoQPc
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hive.nix
View file

@ -81,6 +81,7 @@ in
{ {
meta = { meta = {
nixpkgs = import nixpkgs.nixos.unstable.path;
nodeNixpkgs = mapSingleFuse nodePkgs nodes; nodeNixpkgs = mapSingleFuse nodePkgs nodes;
specialArgs = { specialArgs = {

2
machines/ap01/_configuration.nix
View file

@ -1,5 +1,6 @@
{ {
modulesPath, modulesPath,
sourcePkgs,
... ...
}: }:
{ {
@ -36,4 +37,5 @@
]; ];
hostname = "ap01-prototype"; hostname = "ap01-prototype";
nixpkgs.source = sourcePkgs.path;
} }

2
scripts/cache-node.sh
View file

@ -3,7 +3,7 @@ set -o nounset
set -o pipefail set -o pipefail
shopt -s lastpipe shopt -s lastpipe
system_type="$(colmena eval -E "{ nodes, ... }: nodes.${BUILD_NODE}.config.deployment.systemType")" system_type="$(colmena eval -E "{ nodes, ... }: nodes.${BUILD_NODE}.config.deployment.systemType" --show-trace)"
# Get rid of surrounding quotes. # Get rid of surrounding quotes.
system_type="${system_type%\"}" system_type="${system_type%\"}"
system_type="${system_type#\"}" system_type="${system_type#\"}"