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

2020-04-09 15:54:21 +02:00
parent 03a4a3c95c 30d4618cc9
commit d103c79144
27 changed files with 181 additions and 164 deletions
@@ -1,6 +1,6 @@
 #include "common-eval-args.hh"
 #include "shared.hh"
-#include "download.hh"
+#include "filetransfer.hh"
 #include "util.hh"
 #include "eval.hh"
 #include "fetchers.hh"