fix: pin nixos-option to upstream

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>

default.nix

@@ -0,0 +1,10 @@
+(import
+  (
+    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    fetchTarball {
+      url = lock.nodes.flake-compat.locked.url or "https://git.lix.systems/lix-project/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).defaultNix

flake.lock

@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "flake-compat": {
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "ref": "refs/heads/master",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "revCount": 57,
+        "type": "git",
+        "url": "ssh://git@git.lix.systems/lix-project/flake-compat"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@git.lix.systems/lix-project/flake-compat"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -19,12 +34,13 @@
       }
     },
     "lix": {
+      "flake": false,
       "locked": {
-        "lastModified": 1709811453,
-        "narHash": "sha256-UOyTAdUAJv80w3s6rrgYB5tQjp43u5Zp2dlM94uud04=",
+        "lastModified": 1709868386,
+        "narHash": "sha256-fokesPoYzfq492bpVxC+qc/iRDwsLcOCnq6IOjl6SK4=",
         "ref": "refs/heads/main",
-        "rev": "8a268359b06471b463a8f3fc46c83a1fced8ab75",
-        "revCount": 15077,
+        "rev": "eac76dbe90ad1ceade863744739246e9b6abaa90",
+        "revCount": 15086,
         "type": "git",
         "url": "ssh://gerrit.lix.systems:2022/lix"
       },
@@ -51,6 +67,7 @@
     },
     "root": {
       "inputs": {
+        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "lix": "lix",
         "nixpkgs": "nixpkgs"

flake.nix

@@ -6,8 +6,9 @@
     flake = false;
   };
   inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat";
 
-  outputs = { self, nixpkgs, lix, flake-utils }: {
+  outputs = { self, nixpkgs, lix, flake-utils, ... }: {
     nixosModules.default = import ./module.nix { inherit lix; };
     overlays.default = import ./overlay.nix { inherit lix; };
   } // flake-utils.lib.eachDefaultSystem (system:

overlay.nix

@@ -20,10 +20,14 @@ in
     # FIXME: do something less scuffed
     nix_2_18 = (prev.nixVersions.nix_2_18.override { boehmgc = boehmgc-patched; }).overrideAttrs (old: {
       src = lix;
+      # FIXME: fake version so that nixpkgs will not try to use nix config >_>
       version = "2.18.3-lix";
       VERSION_SUFFIX = "-lix";
 
       patches = [ ];
+      # FIXME: we don't know why this was not being picked up properly when
+      # included in nativeCheckInputs.
+      nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.git ];
     });
     stable = nix_2_18;
     nix_2_18_upstream = prev.nixVersions.nix_2_18;
@@ -40,6 +44,10 @@ in
     nix = final.nixVersions.nix_2_18_upstream;
   };
 
+  nixos-option = prev.nixos-option.override {
+    nix = final.nixVersions.nix_2_18_upstream;
+  };
+
   nix-doc = prev.nix-doc.overrideAttrs (old: {
     # for the purposes of nix C++ API for nix-doc, lix is Nix 2.20
     NIX_CFLAGS_COMPILE = [ "-DNIX_2_20_0" ];