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
@@ -18,7 +18,7 @@ namespace nix {

 class Store;
 class EvalState;
-struct StorePath;
+class StorePath;
 enum RepairFlag : bool;


@@ -75,7 +75,8 @@ public:
        sFile, sLine, sColumn, sFunctor, sToString,
        sRight, sWrong, sStructuredAttrs, sBuilder, sArgs,
        sOutputHash, sOutputHashAlgo, sOutputHashMode,
-        sDescription, sSelf, sEpsilon, sRecurseForDerivations;
+        sRecurseForDerivations,
+        sDescription, sSelf, sEpsilon;
    Symbol sDerivationNix;

    /* If set, force copying files to the Nix store even if they