Merge remote-tracking branch 'upstream/staging' into deps-reorg

2017-09-28 12:32:57 -04:00
parent f08d6f0e2d 4e22e88b91
commit f037625f87
789 changed files with 15725 additions and 8096 deletions
--- a/pkgs/tools/system/gdmap/default.nix
+++ b/pkgs/tools/system/gdmap/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    homepage = http://gdmap.sourceforge.net;
    description = "Recursive rectangle map of disk usage";
    license = licenses.gpl2;
-    platforms = platforms.all;
+    platforms = platforms.linux;
    maintainers = [ maintainers.bjornfor ];
  };
 }