Handle all <nixpkgs> paths with nixpkgs-path.nix.

This file is just defaulting to <nixpkgs>, but we're going to substitue
it by the channel generator. We also need to make sure that we don't
have any other references to <nixpkgs>, but the latter can best be done
on Hydra's side if we don't make <nixpkgs> available to vuizvui builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

10 files changed, 36 insertions, 21 deletions

diff --git a/default.nix b/default.nix
index c85ef72a..f2ea79e2 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { system ? builtins.currentSystem, ... }@args:
 
-with (import <nixpkgs> { inherit system; }).lib;
+with (import (import ./nixpkgs-path.nix) { inherit system; }).lib;
 
 {
   machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs:
@@ -8,9 +8,9 @@ with (import <nixpkgs> { inherit system; }).lib;
   ) (import ./machines { inherit system; });
 
   pkgs = import ./pkgs {
-    pkgs = import <nixpkgs> args;
+    pkgs = import (import ./nixpkgs-path.nix) args;
   };
 
   # Inherit upstream lib until we have our own lib.
-  lib = import <nixpkgs/lib>;
+  lib = import "${import ./nixpkgs-path.nix}/lib";
 }
diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix
index 96edf39c..47664a18 100644
--- a/machines/aszlig/arilou.nix
+++ b/machines/aszlig/arilou.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, modulesPath, ... }:
 
 with lib;
 
@@ -8,7 +8,7 @@ let
   diskID = "usb-Lexar_USB_Flash_Drive_201303211246293590E4-0:0";
 in {
   vuizvui.user.aszlig.profiles.workstation.enable = true;
-  imports = [ <nixpkgs/nixos/modules/profiles/all-hardware.nix> ];
+  imports = [ "${modulesPath}/profiles/all-hardware.nix" ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/machines/default.nix b/machines/default.nix
index d8fbe87f..b2445cdc 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -3,7 +3,7 @@
 let
   callMachine = path: rec {
     config = import path;
-    build = import <nixpkgs/nixos/lib/eval-config.nix> {
+    build = import "${import ../nixpkgs-path.nix}/nixos/lib/eval-config.nix" {
       inherit system;
       modules = [ config ] ++ import ../modules/module-list.nix;
     };
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index 56fbbebf..ac11f224 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, modulesPath, ... }:
 
 let
   greybird = pkgs.stdenv.mkDerivation {
@@ -24,7 +24,7 @@ let
   };
 
 in {
-  imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
+  imports = [ "${modulesPath}/installer/scan/not-detected.nix" ];
 
   boot.loader.grub.device = "/dev/disk/by-id/ata-HITACHI_HTS722010K9SA00_080711DP0270DPGLVMPC";
 
diff --git a/modules/user/aszlig/services/i3/conky.nix b/modules/user/aszlig/services/i3/conky.nix
index 129890c4..d9d44409 100644
--- a/modules/user/aszlig/services/i3/conky.nix
+++ b/modules/user/aszlig/services/i3/conky.nix
@@ -1,4 +1,7 @@
-{ pkgs ? import <nixpkgs> {}, lib ? import <nixpkgs/lib>, timeout ? 300 }:
+{ pkgs ? import (import ../../../../../nixpkgs-path.nix) {}
+, lib ? import "${import ../../../../../nixpkgs-path.nix}/lib"
+, timeout ? 300
+}:
 
 with lib;
 
diff --git a/nixpkgs-path.nix b/nixpkgs-path.nix
new file mode 100644
index 00000000..c13b09db
--- /dev/null
+++ b/nixpkgs-path.nix
@@ -0,0 +1,2 @@
+# This will be replaced by the channel expression generators in release.nix!
+<nixpkgs>
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4a3f819e..576977a4 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import (import ../nixpkgs-path.nix) {} }:
 
 let
   callPackage = pkgs.lib.callPackageWith (pkgs // self);
diff --git a/release.nix b/release.nix
index 4a1db9a1..5e40ea59 100644
--- a/release.nix
+++ b/release.nix
@@ -1,11 +1,17 @@
-{ vuizvui ? { outPath = ./.; revCount = 12345; shortRev = "abcdefg"; }
-, nixpkgs ? { outPath = <nixpkgs>; revCount = 12345; shortRev = "abcdefg"; }
+{ vuizvui ? { outPath  = ./.;
+              revCount = 12345;
+              shortRev = "abcdefg";
+            }
+, nixpkgs ? { outPath  = import ./nixpkgs-path.nix;
+              revCount = 12345;
+              shortRev = "abcdefg";
+            }
 , supportedSystems ? [ "i686-linux" "x86_64-linux" ]
 }:
 
 let
   system = "x86_64-linux";
-  pkgsUpstream = import <nixpkgs> { inherit system; };
+  pkgsUpstream = import nixpkgs { inherit system; };
   root = import ./default.nix { inherit system; };
 
 in with pkgsUpstream.lib; with builtins; {
@@ -19,7 +25,7 @@ in with pkgsUpstream.lib; with builtins; {
   });
 
   pkgs = let
-    releaseLib = import <nixpkgs/pkgs/top-level/release-lib.nix> {
+    releaseLib = import "${nixpkgs}/pkgs/top-level/release-lib.nix" {
       inherit supportedSystems;
       packageSet = attrs: (import ./default.nix attrs).pkgs;
     };
@@ -52,7 +58,7 @@ in with pkgsUpstream.lib; with builtins; {
   };
 
   manual = let
-    modules = import <nixpkgs/nixos/lib/eval-config.nix> {
+    modules = import "${nixpkgs}/nixos/lib/eval-config.nix" {
       modules = import ./modules/module-list.nix;
       check = false;
       inherit system;
@@ -77,7 +83,7 @@ in with pkgsUpstream.lib; with builtins; {
 
     buildCommand = ''
       xsltproc -o options-db.xml \
-        ${<nixpkgs/nixos/doc/manual/options-to-docbook.xsl>} \
+        "${nixpkgs}/nixos/doc/manual/options-to-docbook.xsl" \
         ${optionsFile}
 
       cat > manual.xml <<XML
@@ -96,7 +102,7 @@ in with pkgsUpstream.lib; with builtins; {
         ${pkgsUpstream.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         manual.xml
 
-      cp "${<nixpkgs/nixos/doc/manual/style.css>}" "$out/style.css"
+      cp "${nixpkgs}/nixos/doc/manual/style.css" "$out/style.css"
 
       mkdir -p "$out/nix-support"
       echo "doc manual $out manual.html" \
diff --git a/tests/aszlig/i3.nix b/tests/aszlig/i3.nix
index 408a476d..3c5a5c0c 100644
--- a/tests/aszlig/i3.nix
+++ b/tests/aszlig/i3.nix
@@ -4,7 +4,9 @@
   name = "i3";
 
   machine = { lib, ... }: {
-    imports = [ <nixpkgs/nixos/tests/common/x11.nix> ];
+    imports = [
+      "${import ../../nixpkgs-path.nix}/nixos/tests/common/x11.nix"
+    ];
 
     vuizvui.user.aszlig.profiles.base.enable = true;
 
diff --git a/tests/make-test.nix b/tests/make-test.nix
index 9276dae3..d98ff87f 100644
--- a/tests/make-test.nix
+++ b/tests/make-test.nix
@@ -1,11 +1,13 @@
 f: { system ? builtins.currentSystem, ... } @ args: let
-  lib = import <nixpkgs/lib>;
+  nixpkgsPath = import ../nixpkgs-path.nix;
 
-  testLib = import <nixpkgs/nixos/lib/testing.nix> {
+  lib = import "${nixpkgsPath}/lib";
+
+  testLib = import "${nixpkgsPath}/nixos/lib/testing.nix" {
     inherit system;
   };
 
-  pkgs = import <nixpkgs> { inherit system; };
+  pkgs = import nixpkgsPath { inherit system; };
 
   testArgs = if builtins.isFunction f then f (args // {
     pkgs = pkgs // {