fixes to merged code

src/libexpr/nixexpr.hh

src/libexpr/primops.cc

src/libmain/stack.cc

src/libstore/build.cc

src/libstore/filetransfer.hh

src/libstore/local-store.cc

src/libstore/sqlite.hh

src/libutil/args.cc

src/libutil/error.hh

src/libutil/logging.hh

src/libutil/types.hh

src/libutil/url.hh

src/libutil/util.cc