Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 97b1af1cbe03a48793426bee883ad9c4c9fd7db8
      
https://github.com/NixOS/nix/commit/97b1af1cbe03a48793426bee883ad9c4c9fd7db8
  Author: Eelco Dolstra <eelco.dols...@logicblox.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M src/libstore/build.cc

  Log Message:
  -----------
  Fix --fallback

This fixes an assertion failure in "assert(goal);" in
Worker::waitForInput() after a substitution goal is cancelled by the
termination of another goal. The problem was the line

  //worker.childTerminated(shared_from_this()); // FIXME

in the SubstitutionGoal destructor. This was disabled because
shared_from_this() obviously doesn't work from a destructor. So we now
use a real pointer for object identity.


  Commit: 6631a6e1a15784214bae468a4fdd3168aeef4ab7
      
https://github.com/NixOS/nix/commit/6631a6e1a15784214bae468a4fdd3168aeef4ab7
  Author: Eelco Dolstra <eelco.dols...@logicblox.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M src/libstore/download.cc
    M src/libstore/download.hh
    M src/libstore/http-binary-cache-store.cc

  Log Message:
  -----------
  Increase the sleep time between download retries


Compare: https://github.com/NixOS/nix/compare/dd85fc1c5a30...6631a6e1a157
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to