nix store repair --keep-going

src/libstore/build/entry-points.cc

@@ -145,7 +145,7 @@ void Store::repairPath(const StorePath & path)
             }, bmRepair));
             worker.run(goals);
         } else
-            throw Error(worker.failingExitStatus(), "cannot repair path '%s'", printStorePath(path));
+            throw RepairFailure(worker.failingExitStatus(), "cannot repair path '%s'", printStorePath(path));
     }
 }
 

src/libstore/store-api.hh

@@ -61,6 +61,7 @@ MakeError(InvalidPath, Error);
 MakeError(Unsupported, Error);
 MakeError(SubstituteGone, Error);
 MakeError(SubstituterDisabled, Error);
+MakeError(RepairFailure, Error);
 
 MakeError(InvalidStoreReference, Error);
 

src/nix/store-repair.cc

@@ -19,8 +19,32 @@ struct CmdStoreRepair : StorePathsCommand
 
     void run(ref<Store> store, StorePaths && storePaths) override
     {
+        size_t errors = 0;
+
+        // Remove duplicates.
+        StorePathSet storePathsSet;
         for (auto & path : storePaths)
-            store->repairPath(path);
+            storePathsSet.insert(path);
+
+        for (auto & path : storePathsSet) {
+            try {
+                store->repairPath(path);
+            } catch (Error & e) {
+                // RepairFailure already has the path in the error message, so we omit the redundant trace.
+                if (!dynamic_cast<RepairFailure *>(&e))
+                    e.addTrace({}, "while repairing path '%s'", store->printStorePath(path));
+
+                if (settings.keepGoing) {
+                    errors++;
+                    ignoreExceptionExceptInterrupt();
+                }
+                else
+                    throw;
+            }
+        }
+
+        if (errors)
+            throw Error("could not repair %d store paths", errors);
     }
 };