Merge master into staging

2018-04-08 10:54:17 +02:00
parent f9e17ca3f6 62dc989963
commit 595a72589f
150 changed files with 2923 additions and 772 deletions
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
      algorithms. You can bring your creations to scale using the power of GPUs in the
      cloud or to the masses on mobile with Caffe2's cross-platform libraries.
    '';
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    platforms = with stdenv.lib.platforms; linux;
    license = stdenv.lib.licenses.asl20;
    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
  };