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/development/pure-modules/gen/default.nix
+++ b/pkgs/development/pure-modules/gen/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
    homepage = http://puredocs.bitbucket.org/pure-gen.html;
    license = stdenv.lib.licenses.free;
    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
    maintainers = with stdenv.lib.maintainers; [ asppsa ];
  };
 }