diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 17:29:08 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 17:37:11 +0200 |
| commit | 2cd7c1f19888ae73bf7ef0f41a45680cfb86334a (patch) | |
| tree | 1d153e8744e4fb693b78f5a7c1ac445201b610a2 /nixos/lib/build-vms.nix | |
| parent | 91e71725d49c185401f459f58062b02bcbf1651e (diff) | |
Unify NixOS and Nixpkgs channel structure
This is primarily to ensure that
-I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz
and
-I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz
and
-I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz
behave consistently.
It also allows installing packages via "nix-env -iA nixos.<pkg>"
rather than "nixos.pkgs.<pkg>". It would be even better to allow
"nixpkgs.<pkg>", but that requires a change to nix-channel.
Fixes #7659.
Diffstat (limited to 'nixos/lib/build-vms.nix')
| -rw-r--r-- | nixos/lib/build-vms.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 01d6b21bba90..a97bae57d9bb 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -1,6 +1,6 @@ { system, minimal ? false }: -let pkgs = import ./nixpkgs.nix { config = {}; inherit system; }; in +let pkgs = import ../.. { config = {}; inherit system; }; in with pkgs.lib; with import ../lib/qemu-flags.nix; |