Disallow uninitialized meta.nixpkgs in Flakes

README.md

@@ -143,7 +143,9 @@ Here is a short example:
   outputs = { nixpkgs, ... }: {
     colmena = {
       meta = {
-        inherit nixpkgs;
+        nixpkgs = import nixpkgs {
+          system = "x86_64-linux";
+        };
       };
 
       # Also see the non-Flakes hive.nix example above.

src/nix/eval.nix

@@ -291,15 +291,32 @@ let
     };
   in mergedHive // meta;
 
-  mkNixpkgs = configName: pkgConf:
+  mkNixpkgs = configName: pkgConf: let
+    uninitializedError = typ: ''
+      Passing ${typ} is no longer accepted with Flakes. Please initialize Nixpkgs like the following:
+
+      {
+        # ...
+        outputs = { nixpkgs, ... }: {
+          colmena = {
+            meta = {
+              nixpkgs = import nixpkgs {
+                system = "${currentSystem}";
+              };
+            };
+          };
+        };
+      }
+    '';
+  in
     if typeOf pkgConf == "path" then
+      if hermetic then throw (uninitializedError "a path to Nixpkgs")
       # The referenced file might return an initialized Nixpkgs attribute set directly
-      mkNixpkgs configName (import pkgConf)
+      else mkNixpkgs configName (import pkgConf)
     else if typeOf pkgConf == "lambda" then
       pkgConf {}
     else if typeOf pkgConf == "set" then
-      # FIXME: Allow configuring `system`
+      if pkgConf ? outputs then throw (uninitializedError "an uninitialized Nixpkgs input")
-      if pkgConf ? outputs then mkNixpkgs configName pkgConf.outputs.legacyPackages.${currentSystem}.path
       else pkgConf
     else throw ''
       ${configName} must be one of:

src/nix/tests/simple-flake/flake.nix

@@ -5,7 +5,9 @@
   outputs = { nixpkgs, ... }: {
     colmena = {
       meta = {
-        inherit nixpkgs;
+        nixpkgs = import nixpkgs {
+          system = "x86_64-linux";
+        };
       };
 
       host-a = { name, nodes, pkgs, ... }: {