From 31203732b3104125e107a3141578399cab5d478f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 15:48:39 +0200
Subject: Update the release expressions and the channel generators

---
 nixos/lib/build-vms.nix   | 2 +-
 nixos/lib/eval-config.nix | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'nixos/lib')

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 59f05bfd1043..aad85aedc48e 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -1,6 +1,6 @@
 { system, minimal ? false }:
 
-let pkgs = import <nixpkgs> { config = {}; inherit system; }; in
+let pkgs = import ../.. { config = {}; inherit system; }; in
 
 with pkgs.lib;
 with import ../lib/qemu-flags.nix;
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 47e7d1a0eafa..89f81cf70bd9 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -7,7 +7,6 @@
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
 , modules
-, nixpkgs ? <nixpkgs>
 }:
 
 let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
@@ -31,7 +30,7 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    pkgs_i686 = import nixpkgs { system = "i686-linux"; };
+    pkgs_i686 = import ../.. { system = "i686-linux"; };
     utils = import ./utils.nix pkgs;
   };
 
@@ -48,7 +47,7 @@ rec {
   pkgs =
     if pkgs_ != null
     then pkgs_
-    else import nixpkgs (
+    else import ../.. (
       let
         system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
@@ -56,7 +55,7 @@ rec {
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
-          pkgs = import nixpkgs { system = system_; config = {}; };
+          pkgs = import ../.. { system = system_; config = {}; };
         }).optionDefinitions.nixpkgs;
       in
       {
-- 
cgit 1.4.1