civodul pushed a commit to branch nix in repository guix. commit d7be6d45d97e89653b77686bdb39b833afbcf6ca Merge: 9d0709e d62f46e Author: Eelco Dolstra <[email protected]> Date: Fri Jun 27 11:18:54 2014 +0200
Merge branch 'shlevy-import-native'
src/libexpr/local.mk | 2 ++
src/libexpr/primops.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
src/libstore/globals.cc | 2 ++
src/libstore/globals.hh | 3 +++
4 files changed, 50 insertions(+), 0 deletions(-)
