Move file-hash to content-address

2020-06-02 15:44:58 -04:00 · 2020-06-02 15:44:58 -04:00 · fd2eb41e64
parent 343c20a404
commit fd2eb41e64
6 changed files with 5 additions and 5 deletions
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@ -1,4 +1,4 @@
-#include "file-hash.hh"
+#include "content-address.hh"

 namespace nix {

--- a/src/libstore/content-address.hh
+++ b/src/libstore/content-address.hh
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@ -3,7 +3,7 @@
 #include "path.hh"
 #include "types.hh"
 #include "hash.hh"
-#include "file-hash.hh"
+#include "content-address.hh"

 #include <map>

--- a/src/libstore/path.hh
+++ b/src/libstore/path.hh
@ -1,7 +1,7 @@
 #pragma once

 #include "rust-ffi.hh"
-#include "file-hash.hh"
+#include "content-address.hh"

 namespace nix {

--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@ -2,7 +2,7 @@

 #include "path.hh"
 #include "hash.hh"
-#include "file-hash.hh"
+#include "content-address.hh"
 #include "serialise.hh"
 #include "crypto.hh"
 #include "lru-cache.hh"
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@ -1,6 +1,6 @@
 #include "command.hh"
 #include "hash.hh"
-#include "file-hash.hh"
+#include "content-address.hh"
 #include "legacy.hh"
 #include "shared.hh"
 #include "references.hh"