From 006cb2c5eeeaf2f5267aa8391665fdbf6ca3232c Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Tue, 16 Nov 2021 21:01:40 -0800 Subject: [PATCH] eval.nix: Make the uninitialized nixpkgs error more informative --- src/nix/eval.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/nix/eval.nix b/src/nix/eval.nix index 4df2511..b589785 100644 --- a/src/nix/eval.nix +++ b/src/nix/eval.nix @@ -293,16 +293,15 @@ let mkNixpkgs = configName: pkgConf: let uninitializedError = typ: '' - Passing ${typ} is no longer accepted with Flakes. Please initialize Nixpkgs like the following: + Passing ${typ} as ${configName} is no longer accepted with Flakes. + Please initialize Nixpkgs like the following: { # ... outputs = { nixpkgs, ... }: { colmena = { - meta = { - nixpkgs = import nixpkgs { - system = "${currentSystem}"; - }; + ${configName} = import nixpkgs { + system = "${currentSystem}"; }; }; };