nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-14 22:42:41 +01:00
Code Activity

Merge remote-tracking branch 'upstream/master' into from-dump-stream

Browse source
This commit is contained in:
John Ericson 2020-07-20 17:29:23 +00:00
commit eab945f591
117 changed files with 8354 additions and 1979 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/local-store.cc
View file

@ -594,7 +594,7 @@ uint64_t LocalStore::addValidPath(State & state,
(concatStringsSep(" ", info.sigs), !info.sigs.empty())
(renderContentAddress(info.ca), (bool) info.ca)
.exec();
uint64_t id = sqlite3_last_insert_rowid(state.db);
uint64_t id = state.db.getLastInsertedRowId();
/* If this is a derivation, then store the derivation outputs in
the database. This is useful for the garbage collector: it can