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

feat(hive): Use one less nixpkgs instance
Some checks failed
Run pre-commit on all files / check (push) Successful in 24s
Details
Check meta / check_dns (pull_request) Successful in 19s
Details
Check meta / check_meta (pull_request) Successful in 21s
Details
Check workflows / check_workflows (pull_request) Successful in 26s
Details
Build all the nodes / geo01 (pull_request) Successful in 1m3s
Details
Build all the nodes / bridge01 (pull_request) Successful in 1m6s
Details
Build all the nodes / geo02 (pull_request) Successful in 58s
Details
Build all the nodes / rescue01 (pull_request) Successful in 1m6s
Details
Build all the nodes / storage01 (pull_request) Successful in 1m7s
Details
Run pre-commit on all files / check (pull_request) Successful in 29s
Details
Build all the nodes / vault01 (pull_request) Successful in 1m14s
Details
Build all the nodes / web02 (pull_request) Successful in 1m5s
Details
Build all the nodes / web03 (pull_request) Successful in 1m0s
Details
Build all the nodes / web01 (pull_request) Successful in 1m32s
Details
Build all the nodes / compute01 (pull_request) Failing after 2m56s
Details

Browse source 
This means that the patched sources depend on the node's nixpkgs
This commit is contained in:
Tom Hubrecht 2024-12-06 20:49:24 +01:00
parent 2a7a3aba83
commit a6c6b6f962
Signed by: thubrecht
SSH key fingerprint: SHA256:r+nK/SIcWlJ0zFZJGHtlAoRwq1Rm+WcKAm5ADYMoQPc
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hive.nix
View file

@ -2,9 +2,6 @@ let
sources' = import ./npins; sources' = import ./npins;
# Patch sources directly # Patch sources directly
sources = builtins.mapAttrs (patch.base { pkgs = import sources'.nixos-unstable { }; })
.applyPatches' sources';
nix-lib = import ./lib/nix-lib; nix-lib = import ./lib/nix-lib;
patch = import ./lib/nix-patches { patchFile = ./patches; }; patch = import ./lib/nix-patches { patchFile = ./patches; };
@ -45,8 +42,9 @@ let
}; };
meta = (import ./meta) lib; meta = (import ./meta) lib;
nodeMeta = meta.nodes.${node}; nodeMeta = meta.nodes.${node};
sources = builtins.mapAttrs (patch.base { pkgs = nixpkgs.${version node}; }).applyPatches' sources';
}; };
in in
@ -55,7 +53,7 @@ in
nodeNixpkgs = nix-lib.mapSingleFuse (n: nixpkgs.${version n}) nodes; nodeNixpkgs = nix-lib.mapSingleFuse (n: nixpkgs.${version n}) nodes;
specialArgs = { specialArgs = {
inherit nixpkgs sources; inherit nixpkgs;
dgn-keys = import ./keys; dgn-keys = import ./keys;
}; };
@ -64,7 +62,12 @@ in
}; };
defaults = defaults =
{ name, nodeMeta, ... }: {
name,
nodeMeta,
sources,
...
}:
{ {
# Import the default modules # Import the default modules
imports = [ imports = [