Merge remote-tracking branch 'upstream/master' into nixos-nixpkgs-pkgs-use-overlays

2018-11-04 21:33:16 +01:00
parent 03fc1167e8 14a9365952
commit 51c6f51390
90 changed files with 1759 additions and 885 deletions
@@ -217,7 +217,6 @@ in
  config = {
    _module.args = {
      pkgs = finalPkgs;
-      pkgs_i686 = finalPkgs.pkgsi686Linux;
    };
  };
 }