From 0b06f51113c80cabee610e9096d8c2a9247b245b Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Tue, 26 Aug 2025 17:15:23 +0200
Subject: [PATCH] pass system

---
 deployment/check/data-model/deployment.nix | 8 +++++---
 deployment/check/data-model/nixosTest.nix  | 7 +++++++
 deployment/nixos.nix                       | 4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/deployment/check/data-model/deployment.nix b/deployment/check/data-model/deployment.nix
index 8c6b1f47..b7fbfdd2 100644
--- a/deployment/check/data-model/deployment.nix
+++ b/deployment/check/data-model/deployment.nix
@@ -1,5 +1,6 @@
 {
   config,
+  system,
   inputs ? (import ../../../default.nix { }).inputs,
   sources ? import ../../../npins,
   ...
@@ -7,7 +8,8 @@
 
 let
   inherit (sources) nixpkgs;
-  lib = import "${nixpkgs}/lib";
+  pkgs = import nixpkgs { inherit system; };
+  inherit (pkgs) lib;
   deployment-config = config;
   inherit (lib) mkOption types;
   eval =
@@ -81,7 +83,7 @@ let
             };
         };
         applications.hello =
-          { pkgs, ... }:
+          { ... }:
           {
             description = ''Command-line tool that will print "Hello, world!" on the terminal'';
             module =
@@ -107,7 +109,7 @@ let
                 key-file = null;
               };
               nixos-configuration =
-                { pkgs, ... }:
+                { ... }:
                 {
                   imports = [
                     ./options.nix
diff --git a/deployment/check/data-model/nixosTest.nix b/deployment/check/data-model/nixosTest.nix
index ead89210..a0b95cdc 100644
--- a/deployment/check/data-model/nixosTest.nix
+++ b/deployment/check/data-model/nixosTest.nix
@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }:
 let
@@ -48,6 +49,7 @@ in
           };
           inherit
             ((import ./deployment.nix {
+              inherit (pkgs) system;
               config = deployment-config;
             }).ssh-host.ssh
             )
@@ -66,9 +68,14 @@ in
 
               # INSTANTIATE
               command=(nix-instantiate --show-trace --expr '
+                let
+                  system = "${pkgs.system}"; # FIXME: what system are we deploying to?
+                in
                 import ${pathToRoot}/deployment/nixos.nix {
+                  inherit system;
                   configuration = (
                     import ${pathToRoot}/deployment/check/data-model/deployment.nix {
+                      inherit system;
                       config = builtins.fromJSON "${escapedJson deployment-config}";
                     }
                   ).ssh-host.nixos-configuration;
diff --git a/deployment/nixos.nix b/deployment/nixos.nix
index 65c5fe4b..c5228106 100644
--- a/deployment/nixos.nix
+++ b/deployment/nixos.nix
@@ -1,9 +1,9 @@
 {
   configuration,
-  system ? builtins.currentSystem,
+  system,
+  sources ? import ../npins,
 }:
 let
-  sources = import ../npins;
   eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {
     inherit system;
     specialArgs = {