mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
* Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
This commit is contained in:
parent
48c3faca51
commit
026ff9466a
@ -3,7 +3,7 @@
|
|||||||
system = bootStdenv.system;
|
system = bootStdenv.system;
|
||||||
prehook = ./prehook.sh;
|
prehook = ./prehook.sh;
|
||||||
posthook = ./posthook.sh;
|
posthook = ./posthook.sh;
|
||||||
initialPath = (import ../nix/path.fix) {pkgs = pkgs};
|
initialPath = (import ../nix/path.nix) {pkgs = pkgs};
|
||||||
param1 = pkgs.bash;
|
param1 = pkgs.bash;
|
||||||
param2 = pkgs.gcc;
|
param2 = pkgs.gcc;
|
||||||
param3 = pkgs.binutils;
|
param3 = pkgs.binutils;
|
@ -3,7 +3,7 @@
|
|||||||
system = bootStdenv.system;
|
system = bootStdenv.system;
|
||||||
prehook = ./prehook.sh;
|
prehook = ./prehook.sh;
|
||||||
posthook = ./posthook.sh;
|
posthook = ./posthook.sh;
|
||||||
initialPath = (import ./path.fix) {pkgs = pkgs};
|
initialPath = (import ./path.nix) {pkgs = pkgs};
|
||||||
param1 = pkgs.bash;
|
param1 = pkgs.bash;
|
||||||
param2 = pkgs.gcc;
|
param2 = pkgs.gcc;
|
||||||
param3 = pkgs.binutils;
|
param3 = pkgs.binutils;
|
@ -1,7 +1,7 @@
|
|||||||
# This file evaluates to a function that, when supplied with a system
|
# This file evaluates to a function that, when supplied with a system
|
||||||
# identifier, returns the set of all packages provided by the Nix
|
# identifier, returns the set of all packages provided by the Nix
|
||||||
# Package Collection. It does this by supplying
|
# Package Collection. It does this by supplying
|
||||||
# `all-packages-generic.fix' with a standard build environment.
|
# `all-packages-generic.nix' with a standard build environment.
|
||||||
#
|
#
|
||||||
# On Linux systems, the standard build environment consists of
|
# On Linux systems, the standard build environment consists of
|
||||||
# Nix-built instances glibc and the `standard' Unix tools, i.e., the
|
# Nix-built instances glibc and the `standard' Unix tools, i.e., the
|
||||||
@ -9,7 +9,7 @@
|
|||||||
# we use the native C library.
|
# we use the native C library.
|
||||||
|
|
||||||
{system}: let {
|
{system}: let {
|
||||||
allPackages = import ./all-packages-generic.fix;
|
allPackages = import ./all-packages-generic.nix;
|
||||||
|
|
||||||
# The native (i.e., impure) build environment. This one uses the
|
# The native (i.e., impure) build environment. This one uses the
|
||||||
# tools installed on the system outside of the Nix environment,
|
# tools installed on the system outside of the Nix environment,
|
||||||
@ -29,7 +29,7 @@
|
|||||||
# The Linux build environment consists of the Nix build environment
|
# The Linux build environment consists of the Nix build environment
|
||||||
# built against the GNU C Library.
|
# built against the GNU C Library.
|
||||||
stdenvLinuxGlibc = stdenvNativePkgs.glibc;
|
stdenvLinuxGlibc = stdenvNativePkgs.glibc;
|
||||||
stdenvLinuxBoot = (import ../stdenv/nix-linux/boot.fix) {
|
stdenvLinuxBoot = (import ../stdenv/nix-linux/boot.nix) {
|
||||||
system = system;
|
system = system;
|
||||||
glibc = stdenvLinuxGlibc;
|
glibc = stdenvLinuxGlibc;
|
||||||
};
|
};
|
@ -1 +0,0 @@
|
|||||||
(import ./user-environment.fix) {system = "i686-suse-linux"}
|
|
1
pkgs/system/i686-suse-linux.nix
Normal file
1
pkgs/system/i686-suse-linux.nix
Normal file
@ -0,0 +1 @@
|
|||||||
|
(import ./user-environment.nix) {system = "i686-suse-linux"}
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
{system}: let {
|
{system}: let {
|
||||||
# All activated packages.
|
# All activated packages.
|
||||||
pkgs = (import ./all-packages.fix) {system = system};
|
pkgs = (import ./all-packages.nix) {system = system};
|
||||||
|
|
||||||
# The packages selection for inclusion in the user environment.
|
# The packages selection for inclusion in the user environment.
|
||||||
# This list should be generated automatically by a package
|
# This list should be generated automatically by a package
|
Loading…
Reference in New Issue
Block a user