From 3e53e2ab495ea95054c9160db8584110cae6c860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 2 Jul 2022 09:50:24 +0200 Subject: lib: provide default for nixturrisSystem --- flake.nix | 2 +- lib/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 5225649..e65ae2a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ overlays.default = final: prev: import ./pkgs { nixpkgs = prev; }; nixosModules = import ./nixos self; - lib = import ./lib self; + lib = import ./lib { inherit self; nixpkgsDefault = nixpkgs; }; nixosConfigurations = { tarballMox = self.lib.nixturrisTarballSystem { board = "mox"; nixpkgs = nixpkgs; }; diff --git a/lib/default.nix b/lib/default.nix index 3a8e279..211451e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,4 +1,4 @@ -self: rec { +{ self, nixpkgsDefault }: rec { # Mapping of board name to the appropriate system boardSystem = { @@ -15,7 +15,7 @@ self: rec { # NixOS system for specific Turris board nixturrisSystem = { board, - nixpkgs, + nixpkgs ? nixpkgsDefault, system ? boardSystem.${board}.system, modules ? [], override ? {} -- cgit v1.2.3