public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parameterise the path to nixpkgs. 

This makes it possible to build several NixOS systems that use different
nixpkgs in the same nix-build invocation. Today, you can't do that since
the <nixpkgs> path reference is hard-coded in lib/eval-config.nix.
This commit is contained in:
Rickard Nilsson 2013-01-28 16:11:44 +01:00
parent 45522d0806
commit f9b05ac1fe
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
default.nix
View File

@ -1,11 +1,12 @@
{ configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config> { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
, system ? builtins.currentSystem , system ? builtins.currentSystem
, nixpkgs ? <nixpkgs>
}: }:
let let
eval = import ./lib/eval-config.nix { eval = import ./lib/eval-config.nix {
inherit system; inherit system nixpkgs;
modules = [ configuration ]; modules = [ configuration ];
}; };
@ -13,13 +14,13 @@ let
# This is for `nixos-rebuild build-vm'. # This is for `nixos-rebuild build-vm'.
vmConfig = (import ./lib/eval-config.nix { vmConfig = (import ./lib/eval-config.nix {
inherit system; inherit system nixpkgs;
modules = [ configuration ./modules/virtualisation/qemu-vm.nix ]; modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
}).config; }).config;
# This is for `nixos-rebuild build-vm-with-bootloader'. # This is for `nixos-rebuild build-vm-with-bootloader'.
vmWithBootLoaderConfig = (import ./lib/eval-config.nix { vmWithBootLoaderConfig = (import ./lib/eval-config.nix {
inherit system; inherit system nixpkgs;
modules = modules =
[ configuration [ configuration
./modules/virtualisation/qemu-vm.nix ./modules/virtualisation/qemu-vm.nix

7
lib/eval-config.nix
View File

@ -7,6 +7,7 @@
, baseModules ? import ../modules/module-list.nix , baseModules ? import ../modules/module-list.nix
, extraArgs ? {} , extraArgs ? {}
, modules , modules
, nixpkgs ? <nixpkgs>
}: }:
let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
@ -30,7 +31,7 @@ rec {
extraArgs = extraArgs_ // { extraArgs = extraArgs_ // {
inherit pkgs modules baseModules; inherit pkgs modules baseModules;
modulesPath = ../modules; modulesPath = ../modules;
pkgs_i686 = import <nixpkgs> { system = "i686-linux"; }; pkgs_i686 = import nixpkgs { system = "i686-linux"; };
utils = import ./utils.nix pkgs; utils = import ./utils.nix pkgs;
}; };
@ -47,7 +48,7 @@ rec {
pkgs = pkgs =
if pkgs_ != null if pkgs_ != null
then pkgs_ then pkgs_
else import <nixpkgs> ( else import nixpkgs (
let let
system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_; system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
nixpkgsOptions = (import ./eval-config.nix { nixpkgsOptions = (import ./eval-config.nix {
@ -55,7 +56,7 @@ rec {
# For efficiency, leave out most NixOS modules; they don't # For efficiency, leave out most NixOS modules; they don't
# define nixpkgs.config, so it's pointless to evaluate them. # define nixpkgs.config, so it's pointless to evaluate them.
baseModules = [ ../modules/misc/nixpkgs.nix ]; baseModules = [ ../modules/misc/nixpkgs.nix ];
pkgs = import <nixpkgs> { system = system_; config = {}; }; pkgs = import nixpkgs { system = system_; config = {}; };
}).optionDefinitions.nixpkgs; }).optionDefinitions.nixpkgs;
in in
{ {