Merge remote-tracking branch 'origin/staging'

2016-03-27 13:19:04 +01:00
parent d88ae1045d dae3a7b721
commit b07e7bfc7b
106 changed files with 1065 additions and 3988 deletions
@@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
    homepage = "http://curl.haxx.se/";
    description = "A command line tool for transferring files with URL syntax";
    platforms = with stdenv.lib.platforms; allBut darwin;
+    broken = true;
  };
 }