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

pkgs/top-level/stage.nix: don't override overlays and config in nixpkgsFun

Browse Source 
`nixpkgsFun` already sets them via `args`. Doing this also introduces unexpected
hard to debug errors, see the patch.
This commit is contained in:
Jan Malakhovski 2019-02-23 00:00:00 +00:00 committed by danbst
parent 5aa813dcc9
commit 83ae1ffed4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,14 @@ in let
# compiling toolchains and 32-bit packages on x86_64). In both those cases we # compiling toolchains and 32-bit packages on x86_64). In both those cases we
# want the provided non-native `localSystem` argument to affect the stdenv # want the provided non-native `localSystem` argument to affect the stdenv
# chosen. # chosen.
#
# NB!!! This thing gets its `config` argument from `args`, i.e. it's actually
# `config0`. It is important to keep it to `config0` format (as opposed to the
# result of `evalModules`, i.e. the `config` variable above) throughout all
# nixpkgs evaluations since the above function `config0 -> config` implemented
# via `evalModules` is not idempotent. In other words, if you add `config` to
# `newArgs`, expect strange very hard to debug errors! (Yes, I'm speaking from
# experience here.)
nixpkgsFun = newArgs: import ./. (args // newArgs); nixpkgsFun = newArgs: import ./. (args // newArgs);
# Partially apply some arguments for building bootstraping stage pkgs # Partially apply some arguments for building bootstraping stage pkgs

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

@ -135,7 +135,6 @@ let
# default GNU libc on Linux systems. Non-Linux systems are not # default GNU libc on Linux systems. Non-Linux systems are not
# supported. # supported.
pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
inherit overlays config;
${if stdenv.hostPlatform == stdenv.buildPlatform ${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = { then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // { parsed = stdenv.hostPlatform.parsed // {
@ -152,7 +151,6 @@ let
# All packages built for i686 Linux. # All packages built for i686 Linux.
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun {
inherit overlays config;
${if stdenv.hostPlatform == stdenv.buildPlatform ${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = { then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // { parsed = stdenv.hostPlatform.parsed // {