Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/recursive-nix'

  • Loading branch information
edolstra committed Dec 2, 2019
2 parents ec36458 + 69326f3 commit ac2bc721d84f3c6c214212e41808a45fa792c6e8
Showing with 585 additions and 80 deletions.
  1. +408 −16 src/libstore/build.cc
  2. +96 −57 src/libstore/daemon.cc
  3. +5 −1 src/libstore/daemon.hh
  4. +1 −1 src/libstore/globals.cc
  5. +4 −4 src/nix-daemon/nix-daemon.cc
  6. +2 −1 tests/local.mk
  7. +69 −0 tests/recursive.sh

0 comments on commit ac2bc72

Please sign in to comment.
You can’t perform that action at this time.