summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikola Knezevic <nikola@knezevic.ch>2020-04-06 23:57:28 +0200
committerNikola Knezevic <nikola@knezevic.ch>2020-04-08 22:26:57 +0200
commitf5095594e723d02c9bf22fe24ad838ebff4f9165 (patch)
tree65d6cbe57741c064ad2e011ed6f27ba22ac0825b
parentc330109bfa38370f7cef6449efb88309a78e1684 (diff)
datatransfer.{cc,hh} -> filetransfer.{cc,hh}
-rw-r--r--src/libexpr/common-eval-args.cc2
-rw-r--r--src/libexpr/eval.cc2
-rw-r--r--src/libexpr/parser.y2
-rw-r--r--src/libstore/build.cc2
-rw-r--r--src/libstore/builtins/fetchurl.cc2
-rw-r--r--src/libstore/filetransfer.cc (renamed from src/libstore/datatransfer.cc)2
-rw-r--r--src/libstore/filetransfer.hh (renamed from src/libstore/datatransfer.hh)0
-rw-r--r--src/libstore/http-binary-cache-store.cc2
-rw-r--r--src/libstore/s3-binary-cache-store.cc2
-rwxr-xr-xsrc/nix-channel/nix-channel.cc2
-rw-r--r--src/nix-prefetch-url/nix-prefetch-url.cc2
-rw-r--r--src/nix/main.cc2
-rw-r--r--src/nix/upgrade-nix.cc2
13 files changed, 12 insertions, 12 deletions
diff --git a/src/libexpr/common-eval-args.cc b/src/libexpr/common-eval-args.cc
index 26460601d..10c9c16bb 100644
--- a/src/libexpr/common-eval-args.cc
+++ b/src/libexpr/common-eval-args.cc
@@ -1,6 +1,6 @@
#include "common-eval-args.hh"
#include "shared.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "util.hh"
#include "eval.hh"
#include "fetchers.hh"
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 7a20c6fa6..b91a021b4 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -5,7 +5,7 @@
#include "derivations.hh"
#include "globals.hh"
#include "eval-inline.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "json.hh"
#include "function-trace.hh"
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 8fbe59301..235ed5b1d 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -544,7 +544,7 @@ formal
#include <unistd.h>
#include "eval.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "fetchers.hh"
#include "store-api.hh"
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 9baa2cf1a..0febb8dfb 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -7,7 +7,7 @@
#include "affinity.hh"
#include "builtins.hh"
#include "builtins/buildenv.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "finally.hh"
#include "compression.hh"
#include "json.hh"
diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc
index 1432de9d7..486babf14 100644
--- a/src/libstore/builtins/fetchurl.cc
+++ b/src/libstore/builtins/fetchurl.cc
@@ -1,5 +1,5 @@
#include "builtins.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "store-api.hh"
#include "archive.hh"
#include "compression.hh"
diff --git a/src/libstore/datatransfer.cc b/src/libstore/filetransfer.cc
index 5cc63a1d8..e9684b3d4 100644
--- a/src/libstore/datatransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -1,4 +1,4 @@
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "util.hh"
#include "globals.hh"
#include "store-api.hh"
diff --git a/src/libstore/datatransfer.hh b/src/libstore/filetransfer.hh
index 2347f363d..2347f363d 100644
--- a/src/libstore/datatransfer.hh
+++ b/src/libstore/filetransfer.hh
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index ce0c5af3b..451a64785 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -1,5 +1,5 @@
#include "binary-cache-store.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "globals.hh"
#include "nar-info-disk-cache.hh"
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index fccf010a4..b24e7b7d6 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -6,7 +6,7 @@
#include "nar-info-disk-cache.hh"
#include "globals.hh"
#include "compression.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "istringstream_nocopy.hh"
#include <aws/core/Aws.h>
diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc
index 0f8024d7b..7d584f891 100755
--- a/src/nix-channel/nix-channel.cc
+++ b/src/nix-channel/nix-channel.cc
@@ -1,6 +1,6 @@
#include "shared.hh"
#include "globals.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "store-api.hh"
#include "../nix/legacy.hh"
#include "fetchers.hh"
diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc
index e136bb95a..748554b9c 100644
--- a/src/nix-prefetch-url/nix-prefetch-url.cc
+++ b/src/nix-prefetch-url/nix-prefetch-url.cc
@@ -1,6 +1,6 @@
#include "hash.hh"
#include "shared.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "store-api.hh"
#include "eval.hh"
#include "eval-inline.hh"
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 140c963e0..2c64c7476 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -8,7 +8,7 @@
#include "shared.hh"
#include "store-api.hh"
#include "progress-bar.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "finally.hh"
#include <sys/types.h>
diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc
index 574f7d8c2..4fcc6a721 100644
--- a/src/nix/upgrade-nix.cc
+++ b/src/nix/upgrade-nix.cc
@@ -1,7 +1,7 @@
#include "command.hh"
#include "common-args.hh"
#include "store-api.hh"
-#include "datatransfer.hh"
+#include "filetransfer.hh"
#include "eval.hh"
#include "attr-path.hh"
#include "names.hh"