From ef07fa6d59f93b29be87e516731d26a081998061 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Fri, 3 Feb 2023 18:31:33 +0100
Subject: [PATCH] mkMachine now uses passed nixpkgs version
---
lib/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/default.nix b/lib/default.nix
index 2982035..5a474e7 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,15 +1,15 @@
inputs: final: prev:
-with builtins; with inputs;
+with builtins;
let
overlay-unstable = arch: final: prev: {
- unstable = unstable.legacyPackages."${arch}";
+ unstable = inputs.unstable.legacyPackages."${arch}";
};
in
{
- mkMachine = { host, host-config, modules, system ? "x86_64-linux" }: nixpkgs.lib.nixosSystem {
+ mkMachine = { host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux" }: nixpkgs.lib.nixosSystem {
lib = final;
system = system;
specialArgs = {
@@ -17,10 +17,10 @@ in
};
modules = builtins.attrValues modules ++ [
../base.nix
- sops-nix.nixosModules.sops
+ inputs.sops-nix.nixosModules.sops
host-config
- home-manager.nixosModules.home-manager
- simple-nixos-mailserver.nixosModule
+ inputs.home-manager.nixosModules.home-manager
+ inputs.simple-nixos-mailserver.nixosModule
{
home-manager.useGlobalPkgs = true;
nixpkgs.overlays = [