diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-08-09 20:05:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-09 20:05:03 +0200 |
| commit | 8943e3176d5a94088a2018c3415f2f34fe9309d1 (patch) | |
| tree | 9ef5e37ba712be3693eb274f4e707a43e8d8770c | |
| parent | 27444d40cf726129334899a42d68d69f73baa988 (diff) | |
| parent | 2de7a1fe673e7cc3dd05b7bcfef82681aaf620d4 (diff) | |
Merge pull request #5111 from Pamplemousse/clean
Minor maintenance cleaning
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/libexpr/primops.cc | 2 | ||||
| -rw-r--r-- | src/libstore/binary-cache-store.cc | 11 |
3 files changed, 0 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore index 1affd733d..86ffe9304 100644 --- a/.gitignore +++ b/.gitignore @@ -57,9 +57,6 @@ perl/Makefile.config /src/nix-prefetch-url/nix-prefetch-url -# /src/nix-daemon/ -/src/nix-daemon/nix-daemon - /src/nix-collect-garbage/nix-collect-garbage # /src/nix-channel/ diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 209a05d11..bfe41c9fa 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -3645,9 +3645,7 @@ void EvalState::createBaseEnv() if (!evalSettings.pureEval) { mkInt(v, time(0)); addConstant("__currentTime", v); - } - if (!evalSettings.pureEval) { mkString(v, settings.thisSystem.get()); addConstant("__currentSystem", v); } diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index df401e6f4..74eb0a9ab 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -130,17 +130,6 @@ AutoCloseFD openFile(const Path & path) return fd; } -struct FileSource : FdSource -{ - AutoCloseFD fd2; - - FileSource(const Path & path) - : fd2(openFile(path)) - { - fd = fd2.get(); - } -}; - ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon( Source & narSource, RepairFlag repair, CheckSigsFlag checkSigs, std::function<ValidPathInfo(HashResult)> mkInfo) |