Merge remote-tracking branch 'origin/master' into flakes

2020-06-26 08:46:46 +02:00
parent 09fc06daab b7ccf7ae2a
commit adf2fbbdc2
66 changed files with 751 additions and 359 deletions
@@ -348,10 +348,10 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
    , sOutputHash(symbols.create("outputHash"))
    , sOutputHashAlgo(symbols.create("outputHashAlgo"))
    , sOutputHashMode(symbols.create("outputHashMode"))
+    , sRecurseForDerivations(symbols.create("recurseForDerivations"))
    , sDescription(symbols.create("description"))
    , sSelf(symbols.create("self"))
    , sEpsilon(symbols.create(""))
-    , sRecurseForDerivations(symbols.create("recurseForDerivations"))
    , repair(NoRepair)
    , store(store)
    , baseEnv(allocEnv(128))