nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace some ${nixpkgsPath}/pkgs by ${pkgs.path}.

Browse Source 
svn path=/nixos/branches/fix-style/; revision=13380
This commit is contained in:
Nicolas Pierron 2008-11-23 01:29:13 +00:00
parent 157bb2b71a
commit 3b2016569a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boot/boot-stage-1.nix
View File

@ -4,28 +4,28 @@
# calls the init in the root file system to start the second boot
# stage.
{ pkgs, config, nixpkgsPath, kernelPackages, modulesTree }:
{ pkgs, config, kernelPackages, modulesTree }:
rec {
pkgsDiet = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
pkgsDiet = import "${pkgs.path}/top-level/all-packages.nix" {
system = pkgs.stdenv.system;
bootStdenv = pkgs.useDietLibC pkgs.stdenv;
};
pkgsKlibc = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
pkgsKlibc = import "${pkgs.path}/top-level/all-packages.nix" {
system = pkgs.stdenv.system;
bootStdenv = pkgs.useKlibc pkgs.stdenv kernelPackages.klibc;
};
pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
pkgsStatic = import "${pkgs.path}/top-level/all-packages.nix" {
system = pkgs.stdenv.system;
bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
};
stdenvLinuxStuff = import "${nixpkgsPath}/pkgs/stdenv/linux" {
stdenvLinuxStuff = import "${pkgs.path}/stdenv/linux" {
system = pkgs.stdenv.system;
allPackages = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix";
allPackages = import "${pkgs.path}/top-level/all-packages.nix";
};

4
installer/default.nix
View File

@ -1,4 +1,4 @@
{pkgs, config, nix, nixpkgsPath}:
{pkgs, config, nix}:
let
@ -25,7 +25,7 @@ in
inherit nix;
nixpkgsURL = config.installer.nixpkgsURL;
pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
nixClosure = pkgs.runCommand "closure"
{exportReferencesGraph = ["refs" nix];}

4
system/system.nix
View File

@ -41,7 +41,7 @@ rec {
# The initial ramdisk.
initialRamdiskStuff = import ../boot/boot-stage-1.nix {
inherit pkgs config nixpkgsPath kernelPackages modulesTree;
inherit pkgs config kernelPackages modulesTree;
};
initialRamdisk = initialRamdiskStuff.initialRamdisk;
@ -49,7 +49,7 @@ rec {
# NixOS installation/updating tools.
nixosTools = import ../installer {
inherit pkgs config nix nixpkgsPath;
inherit pkgs config nix;
};