aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorCarlo Nucera <carlo.nucera@protonmail.com>2020-06-02 15:44:58 -0400
committerCarlo Nucera <carlo.nucera@protonmail.com>2020-06-02 15:44:58 -0400
commitfd2eb41e6433e72516ae149949b8b0050305293d (patch)
tree51c993342b3a1a66194e5c5a58359677cb6d9c2b /src/libstore
parent343c20a404055d266227b7562f775f7fad37103f (diff)
Move file-hash to content-address
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/content-address.cc (renamed from src/libstore/file-hash.cc)2
-rw-r--r--src/libstore/content-address.hh (renamed from src/libstore/file-hash.hh)0
-rw-r--r--src/libstore/derivations.hh2
-rw-r--r--src/libstore/path.hh2
-rw-r--r--src/libstore/store-api.hh2
5 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/file-hash.cc b/src/libstore/content-address.cc
index caf9a83e9..421127f5a 100644
--- a/src/libstore/file-hash.cc
+++ b/src/libstore/content-address.cc
@@ -1,4 +1,4 @@
-#include "file-hash.hh"
+#include "content-address.hh"
namespace nix {
diff --git a/src/libstore/file-hash.hh b/src/libstore/content-address.hh
index 64d514751..64d514751 100644
--- a/src/libstore/file-hash.hh
+++ b/src/libstore/content-address.hh
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index dba9318d9..838b63358 100644
--- 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>
diff --git a/src/libstore/path.hh b/src/libstore/path.hh
index dfc0a9531..fdbc906ef 100644
--- 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 {
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 7836c04dc..441e3efc5 100644
--- 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"