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

2020-04-01 00:03:50 +02:00
parent 03b56e96bf a7540294cf
commit 4fdec5f61d
6 changed files with 10 additions and 23 deletions
@@ -171,7 +171,7 @@ std::set<StorePath> toDerivations(ref<Store> store,
   filename:lineno. */
 Strings editorFor(const Pos & pos);

-struct MixProfile : virtual Args, virtual StoreCommand
+struct MixProfile : virtual StoreCommand
 {
    std::optional<Path> profile;