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

stage: remove nixpkgsFun

Browse Source 
also inherit forceSystem for some GNU Hurd stuff
This commit is contained in:
Matthew Bauer 2018-06-25 14:50:50 -04:00
parent d1bd9faf61
commit 18af089de7
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,13 +5,14 @@
* to merges. Please use the full-text search of your editor. ;) * to merges. Please use the full-text search of your editor. ;)
* Hint: ### starts category names. * Hint: ### starts category names.
*/ */
{ lib, nixpkgsFun, noSysDirs, config}: { lib, noSysDirs, config}:
self: pkgs: self: pkgs:
with pkgs; with pkgs;
{ {
# Allow callPackage to fill in the pkgs argument
inherit pkgs; inherit pkgs;
# A stdenv capable of building 32-bit binaries. On x86_64-linux, # A stdenv capable of building 32-bit binaries. On x86_64-linux,
@ -2404,7 +2405,7 @@ with pkgs;
fluentd = callPackage ../tools/misc/fluentd { }; fluentd = callPackage ../tools/misc/fluentd { };
flvstreamer = callPackage ../tools/networking/flvstreamer { }; flvstreamer = callPackage ../tools/networking/flvstreamer { };
hmetis = callPackage_i686 ../applications/science/math/hmetis { }; hmetis = callPackage_i686 ../applications/science/math/hmetis { };
libbsd = callPackage ../development/libraries/libbsd { }; libbsd = callPackage ../development/libraries/libbsd { };
@ -3703,7 +3704,7 @@ with pkgs;
lzip = callPackage ../tools/compression/lzip { }; lzip = callPackage ../tools/compression/lzip { };
luxcorerender = callPackage ../tools/graphics/luxcorerender { }; luxcorerender = callPackage ../tools/graphics/luxcorerender { };
xz = callPackage ../tools/compression/xz { }; xz = callPackage ../tools/compression/xz { };
lz4 = callPackage ../tools/compression/lz4 { }; lz4 = callPackage ../tools/compression/lz4 { };
@ -4968,7 +4969,7 @@ with pkgs;
securefs = callPackage ../tools/filesystems/securefs { }; securefs = callPackage ../tools/filesystems/securefs { };
seexpr = callPackage ../development/compilers/seexpr { }; seexpr = callPackage ../development/compilers/seexpr { };
setroot = callPackage ../tools/X11/setroot { }; setroot = callPackage ../tools/X11/setroot { };
setserial = callPackage ../tools/system/setserial { }; setserial = callPackage ../tools/system/setserial { };
@ -5873,14 +5874,7 @@ with pkgs;
xbursttools = callPackage ../tools/misc/xburst-tools { xbursttools = callPackage ../tools/misc/xburst-tools {
# It needs a cross compiler for mipsel to build the firmware it will # It needs a cross compiler for mipsel to build the firmware it will
# load into the Ben Nanonote # load into the Ben Nanonote
gccCross = gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic;
let
pkgsCross = nixpkgsFun {
# Ben Nanonote system
crossSystem = lib.systems.examples.ben-nanonote;
};
in
pkgsCross.buildPackages.gccCrossStageStatic;
}; };
xclip = callPackage ../tools/misc/xclip { }; xclip = callPackage ../tools/misc/xclip { };

8
pkgs/top-level/stage.nix
View File

@ -93,7 +93,7 @@ let
allPackages = self: super: allPackages = self: super:
let res = import ./all-packages.nix let res = import ./all-packages.nix
{ inherit lib nixpkgsFun noSysDirs config; } { inherit lib noSysDirs config; }
res self; res self;
in res; in res;
@ -138,10 +138,8 @@ let
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = forceSystem "i686-linux" "i386"; pkgsi686Linux = forceSystem "i686-linux" "i386";
callPackage_i686 = self.pkgsi686Linux.callPackage;
callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" inherit forceSystem;
then self.pkgsi686Linux.callPackage
else throw "callPackage_i686 not supported on system '${stdenv.system}'";
}; };
# The complete chain of package set builders, applied from top to bottom. # The complete chain of package set builders, applied from top to bottom.