forked from DGNum/infrastructure
feat(infra): Switch to lix
This commit is contained in:
parent
c233a22a1a
commit
96e9f14e2d
3 changed files with 51 additions and 2 deletions
18
hive.nix
18
hive.nix
|
@ -66,10 +66,24 @@ in
|
|||
};
|
||||
|
||||
defaults =
|
||||
{ name, nodeMeta, ... }:
|
||||
{
|
||||
pkgs,
|
||||
name,
|
||||
nodeMeta,
|
||||
...
|
||||
}:
|
||||
{
|
||||
# Import the default modules
|
||||
imports = [ ./modules ];
|
||||
imports = [
|
||||
./modules
|
||||
(import "${sources.lix-module}/module.nix" {
|
||||
lix = pkgs.applyPatches {
|
||||
name = "lix-2.90.patched";
|
||||
src = sources.lix;
|
||||
patches = [ ./patches/00-disable-installChecks-lix.patch ];
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
# Include default secrets
|
||||
age-secrets.sources = [ ./machines/${name}/secrets ];
|
||||
|
|
|
@ -100,6 +100,28 @@
|
|||
"url": "https://github.com/JulienMalka/Linkal/archive/085630bf369b68d2264baca020efc94c877d78e6.tar.gz",
|
||||
"hash": "0m426vjk7mjyp1gd1dsnnn5xkplsqs0ksawbmhza6fycsmavc3cx"
|
||||
},
|
||||
"lix": {
|
||||
"type": "Git",
|
||||
"repository": {
|
||||
"type": "Git",
|
||||
"url": "https://git.lix.systems/lix-project/lix.git"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "d00edfb28d0a52d9acd392c582a43f98e773cf4c",
|
||||
"url": null,
|
||||
"hash": "0gnvk11kblidk2fpb4fhglc4lwk5acjm4v68rj79z7pjr4sc5r7p"
|
||||
},
|
||||
"lix-module": {
|
||||
"type": "Git",
|
||||
"repository": {
|
||||
"type": "Git",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module.git"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
|
||||
"url": null,
|
||||
"hash": "02dg1icyxamxblrvgxshadp2s8mx2ryjja7m9w26sgs07jl438zk"
|
||||
},
|
||||
"metis": {
|
||||
"type": "Git",
|
||||
"repository": {
|
||||
|
|
13
patches/00-disable-installChecks-lix.patch
Normal file
13
patches/00-disable-installChecks-lix.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/package.nix b/package.nix
|
||||
index 43b709023..b68857796 100644
|
||||
--- a/package.nix
|
||||
+++ b/package.nix
|
||||
@@ -351,7 +351,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
echo "doc internal-api-docs $out/share/doc/nix/internal-api/html" >> "$out/nix-support/hydra-build-products"
|
||||
'';
|
||||
|
||||
- doInstallCheck = finalAttrs.doCheck;
|
||||
+ doInstallCheck = false;
|
||||
|
||||
mesonInstallCheckFlags = [
|
||||
"--suite=installcheck"
|
Loading…
Reference in a new issue