From 96e9f14e2d28d1212810f99d6a1bf6db4ac468f0 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Wed, 15 May 2024 19:18:29 +0200
Subject: [PATCH] feat(infra): Switch to lix

---
 hive.nix                                   | 18 ++++++++++++++++--
 npins/sources.json                         | 22 ++++++++++++++++++++++
 patches/00-disable-installChecks-lix.patch | 13 +++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 patches/00-disable-installChecks-lix.patch

diff --git a/hive.nix b/hive.nix
index 1f53919..c6aa9f6 100644
--- a/hive.nix
+++ b/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 ];
diff --git a/npins/sources.json b/npins/sources.json
index 08ee217..f54c130 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -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": {
diff --git a/patches/00-disable-installChecks-lix.patch b/patches/00-disable-installChecks-lix.patch
new file mode 100644
index 0000000..9f6fa93
--- /dev/null
+++ b/patches/00-disable-installChecks-lix.patch
@@ -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"