From 2e23053c8ef76416553973cc227ac976a9765128 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sun, 4 May 2025 19:09:44 +0200
Subject: tests: use nixpkgs without unnecessary overlays

introduces a 'boring' nixpkgs used by default for running VM tests
in this repo, i.e. do not force others to build my current version
of things like lix, which I overlay & which are part of any system
closure, but not actually important for testing.
---
 default.nix       |  2 +-
 inputs.nix        | 10 ++++++++++
 tests/default.nix |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index 1d100d1..55e130e 100644
--- a/default.nix
+++ b/default.nix
@@ -87,7 +87,7 @@ let
 
     modules = import ./modules;
     packages = import ./pkgs { inherit nixpkgs; };
-    tests = import ./tests { inherit nixpkgs; };
+    tests = import ./tests { inherit nixpkgs; inherit system; };
   };
 
 in self
diff --git a/inputs.nix b/inputs.nix
index 8902303..7329531 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; };
diff --git a/tests/default.nix b/tests/default.nix
index 5c165db..06d2f52 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? (import ../inputs.nix { }).nixpkgs }:
+{ system ? "x86_64-linux", nixpkgs ? (import ../inputs.nix { inherit system; }).nixpkgs-boring }:
 
 {
   bookwyrm = nixpkgs.nixosTest ./bookwyrm.nix;
-- 
cgit v1.2.3