Merge branch 'master' into staging

2015-07-26 17:57:46 +02:00
parent 3465ffa8b0 3322c96a36
commit b875ea5d29
122 changed files with 2787 additions and 1182 deletions
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation (args // {
    export CARGO_HOME="$(realpath deps)"

    # Let's find out which $indexHash cargo uses for file:///dev/null
-    (cd $sourceRoot && cargo fetch &>/dev/null)
+    (cd $sourceRoot && cargo fetch &>/dev/null) || true
    cd deps
    indexHash="$(basename $(echo registry/index/*))"