anchor.diff:      in
         # allow both:
         # { /* the config */ } and
  -      # { pkgsOrig, pkgs, ... } : { /* the config */ }
  +      # { pkgs, ... } : { /* the config */ }
         if builtins.isFunction configExpr
  -        then configExpr { inherit pkgs pkgsOrig; }
  +        then configExpr { inherit pkgs; }
           else configExpr;
   
     # Return an attribute from the Nixpkgs configuration file, or
  
positive.code:   nbd = callPackage ../tools/networking/nbd {
      glib = gtkLibs.glib.override {
        stdenv = makeStaticBinaries stdenv;
    };
    };
  
    nc6 = callPackage ../tools/networking/nc6 { };
  
negative.code: 
    newScope = extra: lib.callPackageWith (defaultScope // extra);
  
    
    # Override system. This is useful to build i686 packages on x86_64-linux.
    forceSystem = system: (import ./all-packages.nix) {
      inherit system;
      inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
    };
  
    
    # Used by wine, firefox with debugging version of Flash, ...
    pkgsi686Linux = forceSystem "i686-linux";
  
    callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);
  
  
    # For convenience, allow callers to get the path to Nixpkgs.
  