aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-07-02 09:50:24 +0200
committerKarel Kočí <cynerd@email.cz>2022-07-02 09:50:24 +0200
commit3e53e2ab495ea95054c9160db8584110cae6c860 (patch)
tree2e2a588dd5743b8abab95aea13f94d490ed2bb0e
parenta7e2c790b76faadb5f1dcf3745c240eaa24a037a (diff)
downloadnixturris-3e53e2ab495ea95054c9160db8584110cae6c860.tar.gz
nixturris-3e53e2ab495ea95054c9160db8584110cae6c860.tar.bz2
nixturris-3e53e2ab495ea95054c9160db8584110cae6c860.zip
lib: provide default for nixturrisSystem
-rw-r--r--flake.nix2
-rw-r--r--lib/default.nix4
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 ? {}