1 files changed, 36 insertions, 1 deletions
diff --git a/inputs.nix b/inputs.nix
index 8902303..9cb3bf3 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -34,6 +34,16 @@ let
       ];
     } // { outPath = sources.nixpkgs.outPath; };
 
+    # 'boring' version of nixpkgs with fewer (used for vm tests,
+    # so they're buildable without having to compile e.g. the lix version
+    # from the overlay)
+    nixpkgs-boring = import sources.nixpkgs {
+      inherit system;
+      overlays = [
+        (import ./pkgs/overlay.nix { inherit inputs; })
+      ];
+    } // { outPath = sources.nixpkgs.outPath; };
+
     nixpkgs-unstable =
       import sources.nixpkgs-unstable { inherit system; }
       // { outPath = sources.nixpkgs-unstable.outPath; };
@@ -53,7 +63,32 @@ let
     simple-nixos-mailserver = import sources.simple-nixos-mailserver;
 
     lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" {
-      lix = sources.lix;
+      lix = sources.lix // { rev = sources.lix.revision; };
+    };
+
+
+    ###### Forester stuff
+
+    flake-compat = import sources.flake-compat;
+
+    # currently unused
+    opam2json = callFlake "opam2json" {
+      nixpkgs = nixpkgs-flake;
+    };
+    # opam-nix does not want to be called like this; i do not know why
+    # opam-nix = callFlake "opam-nix"{
+    #   inherit (sources) opam-repository opam-overlays mirage-opam-overlays;
+    #   inherit (inputs) flake-utils opam2json flake-compat;
+    #   nixpkgs = nixpkgs-unstable-flake;
+    # };
+    # so i gave up an use the flake-compat'd version instead, which uses an
+    # old nixpkgs pin i cannot easily change ...
+    opam-nix = (flake-compat { src = sources.opam-nix.outPath; }).defaultNix;
+
+    ocaml-forester = callFlake "ocaml-forester" {
+      nixpkgs = nixpkgs-flake;
+      inherit (inputs) opam-nix flake-utils;
+      inherit (sources) opam-repository;
     };
   };
 in inputs