movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Update the release expressions and the channel generators

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-01 15:48:39 +02:00
parent 041da5a6f9
commit 31203732b3
8 changed files with 39 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/lib/eval-config.nix
View file

@ -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
{