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

pkgs/top-level/all-packages.nix: strip trailing white space, no functional change

Browse Source 
svn path=/nixpkgs/trunk/; revision=23830
This commit is contained in:
Peter Simons 2010-09-17 14:47:02 +00:00
parent c8fbebe6b6
commit 84302a3554
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

@ -106,10 +106,10 @@ let
(lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) pkgsOrig.stdenv.overrides); (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) pkgsOrig.stdenv.overrides);
# The un-overriden packages, passed to `overrider'. # The un-overriden packages, passed to `overrider'.
pkgsOrig = pkgsFun pkgs {}; pkgsOrig = pkgsFun pkgs {};
# The overriden, final packages. # The overriden, final packages.
pkgs = pkgsFun pkgs overrides; pkgs = pkgsFun pkgs overrides;
in pkgs; in pkgs;
@ -133,14 +133,14 @@ let
newScope = extra: lib.callPackageWith (defaultScope // extra); newScope = extra: lib.callPackageWith (defaultScope // extra);
# Override system. This is useful to build i686 packages on x86_64-linux. # Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: (import ./all-packages.nix) { forceSystem = system: (import ./all-packages.nix) {
inherit system; inherit system;
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
}; };
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = forceSystem "i686-linux"; pkgsi686Linux = forceSystem "i686-linux";
@ -4633,7 +4633,7 @@ let
nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
openafsClient = callPackage ../servers/openafs-client { }; openafsClient = callPackage ../servers/openafs-client { };
openiscsi = callPackage ../os-specific/linux/open-iscsi { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { };
wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };