anchor.diff:        stdenvAdapters =
           import ../stdenv/adapters.nix pkgs;
   
  -      self = with helperFunctions; with self; with overrides; {
  -
  -  # Make some arguments passed to all-packages.nix available
  -  inherit system platform;
  -
  -  # Allow callPackage to fill in the pkgs argument
  -  inherit pkgs;
  -
  -
  -  # We use `callPackage' to be able to omit function arguments that
  -  # can be obtained from `pkgs' or `pkgs.xorg' (i.e. `defaultScope').
  -  # Use `newScope' for sets of packages in `pkgs' (see e.g. `gnome'
  -  # below).
  -  callPackage = newScope {};
  -
  -  callPackages = lib.callPackagesWith defaultScope;
  -
  -  newScope = extra: lib.callPackageWith (defaultScope // extra);
  -
  -  # Easily override this package set.
  -  # Warning: this function is very expensive and must not be used
  -  # from within the nixpkgs repository.
  -  #
  -  # Example:
  -  #  pkgs.overridePackages (self: super: {
  -  #    foo = super.foo.override { ... };
  -  #  }
  -  #
  -  # The result is `pkgs' where all the derivations depending on `foo'
  -  # will use the new version.
  -  overridePackages = f: applyGlobalOverrides pkgs f;
  -
  -  # Override system. This is useful to build i686 packages on x86_64-linux.
  -  forceSystem = system: kernel: (import ./../..) {
  -    inherit system;
  -    platform = platform // { kernelArch = kernel; };
  -    inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
  -      crossSystem;
  -  };
  -
  -
  -  # Used by wine, firefox with debugging version of Flash, ...
  -  pkgsi686Linux = forceSystem "i686-linux" "i386";
  -
  -  callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);
  -
  -
  -  # For convenience, allow callers to get the path to Nixpkgs.
  -  path = ../..;
  -
  -
  -  ### Helper functions.
  -  inherit lib config stdenvAdapters;
  -
  -  inherit (lib) lowPrio hiPrio appendToName makeOverridable;
  -  inherit (misc) versionedDerivation;
  -
  -  # Applying this to an attribute set will cause nix-env to look
  -  # inside the set for derivations.
  -  recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
  -
  -  builderDefs = lib.composedArgsAndFun (callPackage ../build-support/builder-defs/builder-defs.nix) {};
  -
  -  builderDefsPackage = builderDefs.builderDefsPackage builderDefs;
  -
  -  stringsWithDeps = lib.stringsWithDeps;
  -
  -
  -  ### Nixpkgs maintainer tools
  -
  -  nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
  -
  -  nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { };
  +      stdenvDefault = with helperFunctions; with self; with overrides; {
   
   
     ### STANDARD ENVIRONMENT
  
positive.code:       else
          defaultStdenv;
  
    forceNativeDrv = drv : if crossSystem == null then drv else
      (drv // { crossDrv = drv.nativeDrv; });
  
    # A stdenv capable of building 32-bit binaries.  On x86_64-linux,
    # it uses GCC compiled with multilib support; on i686-linux, it's
  
negative.code:       overrideCC stdenv gcc_multi
      else
        stdenv);
  
    # For convenience, allow callers to get the path to Nixpkgs.
    path = ../..;
  
  
    ### Helper functions.
    inherit lib config stdenvAdapters;
  
    inherit (lib) lowPrio hiPrio appendToName makeOverridable;
    inherit (misc) versionedDerivation;
  
    # Applying this to an attribute set will cause nix-env to look
    # inside the set for derivations.
    recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
  
    builderDefs = lib.composedArgsAndFun (callPackage ../build-support/builder-defs/builder-defs.nix) {};
  
    builderDefsPackage = builderDefs.builderDefsPackage builderDefs;
  
    stringsWithDeps = lib.stringsWithDeps;
  
  
    ### Nixpkgs maintainer tools
  
    nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
  
    nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { };
  
  
    ### BUILD SUPPORT
  