feat(infra): Switch to lix
Some checks failed
Check meta / check_meta (push) Successful in 17s
Check meta / check_meta (pull_request) Successful in 17s
Check meta / check_dns (push) Successful in 38s
Check meta / check_dns (pull_request) Successful in 35s
build configuration / build_compute01 (pull_request) Successful in 17m36s
build configuration / build_vault01 (pull_request) Successful in 17m10s
build configuration / build_web02 (pull_request) Failing after 1m32s
build configuration / build_web01 (pull_request) Successful in 1m56s
build configuration / build_rescue01 (pull_request) Successful in 1m18s
build configuration / build_storage01 (pull_request) Successful in 21m11s
build configuration / push_to_cache (pull_request) Has been skipped
build configuration / build_storage01 (push) Successful in 1m23s
build configuration / build_compute01 (push) Successful in 1m29s
build configuration / build_vault01 (push) Successful in 1m35s
build configuration / build_web01 (push) Successful in 1m51s
lint / check (push) Successful in 27s
build configuration / build_rescue01 (push) Successful in 1m12s
build configuration / build_web02 (push) Failing after 1m20s
build configuration / push_to_cache (push) Has been skipped

This commit is contained in:
Tom Hubrecht 2024-05-15 19:18:29 +02:00
parent c233a22a1a
commit 96e9f14e2d
3 changed files with 51 additions and 2 deletions

View file

@ -66,10 +66,24 @@ in
}; };
defaults = defaults =
{ name, nodeMeta, ... }: {
pkgs,
name,
nodeMeta,
...
}:
{ {
# Import the default modules # 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 # Include default secrets
age-secrets.sources = [ ./machines/${name}/secrets ]; age-secrets.sources = [ ./machines/${name}/secrets ];

View file

@ -100,6 +100,28 @@
"url": "https://github.com/JulienMalka/Linkal/archive/085630bf369b68d2264baca020efc94c877d78e6.tar.gz", "url": "https://github.com/JulienMalka/Linkal/archive/085630bf369b68d2264baca020efc94c877d78e6.tar.gz",
"hash": "0m426vjk7mjyp1gd1dsnnn5xkplsqs0ksawbmhza6fycsmavc3cx" "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": { "metis": {
"type": "Git", "type": "Git",
"repository": { "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"