Merge staging-next into staging

pkgs/misc/emulators/wine/util.nix

@@ -3,7 +3,7 @@ rec {
   toPackages = pkgNames: pkgs:
     map (pn: lib.getAttr pn pkgs) pkgNames;
   toBuildInputs = pkgArches: archPkgs:
-    lib.concatLists (map archPkgs pkgArches);  
+    lib.concatLists (map archPkgs pkgArches);
   mkBuildInputs = pkgArches: pkgNames:
     toBuildInputs pkgArches (toPackages pkgNames);
 }

pkgs/misc/source-and-tags/default.nix

@@ -1,6 +1,6 @@
 { stdenv, lib, glibcLocales, unzip, hasktags, ctags } : {
   # optional srcDir
-  annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags 
+  annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags
                                       || x ? meta && x.meta ? sourceWithTags );
   # hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now
   # that's why I'm abusing meta for the same purpose in ghcsAndLibs
@@ -10,7 +10,7 @@
 
   # createTagFiles =  [ { name  = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ]
   # tag command must create file named $TAG_FILE
-  sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :  
+  sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :
     stdenv.mkDerivation {
     phases = "unpackPhase buildPhase";
     inherit src srcDir tagSuffix;
@@ -72,7 +72,7 @@
 
 
   addCTaggingInfo = deriv :
-    deriv // { 
+    deriv // {
       passthru = {
         sourceWithTags = {
          inherit (deriv) src;