feat(infra): Switch to lix
Some checks failed
Check meta / check_meta (pull_request) Successful in 28s
lint / check (push) Successful in 42s
Check meta / check_dns (pull_request) Successful in 48s
build configuration / build_compute01 (pull_request) Failing after 1m24s
build configuration / build_vault01 (pull_request) Failing after 1m25s
build configuration / build_storage01 (pull_request) Failing after 1m25s
build configuration / build_web01 (pull_request) Failing after 1m9s
build configuration / build_rescue01 (pull_request) Failing after 59s
build configuration / build_web02 (pull_request) Failing after 1m7s
build configuration / push_to_cache (pull_request) Has been skipped

This commit is contained in:
Tom Hubrecht 2024-05-15 19:18:29 +02:00
parent 076e6a499a
commit 71e769bdce
3 changed files with 56 additions and 2 deletions

View file

@ -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 ];
@ -87,6 +101,11 @@ in
dates = "weekly";
options = "--delete-older-than 7d";
};
settings = {
extra-substituters = [ "https://cache.lix.systems" ];
trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
};
};
# Allow unfree packages

View file

@ -89,6 +89,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": "8f9bcd20ebc1a4bdf44e8c1b16cac9a905c505d9",
"url": null,
"hash": "1d3k7p04dplz23krznqlmaizmjpq8m3934pav9llk9m5qq856ms4"
},
"lix-module": {
"type": "Git",
"repository": {
"type": "Git",
"url": "https://git.lix.systems/lix-project/nixos-module.git"
},
"branch": "main",
"revision": "87b7b7e4bd936301b139e472589d1966b136f45f",
"url": null,
"hash": "08sr2qkjn1j7b9wyvisax3bzwgsd3p8xxzri2vvb9rdbbbp0fwx5"
},
"metis": {
"type": "Git",
"repository": {

View 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"