From 686ee74f09496441c56aeffcdf3cc83f59d27bed Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Tue, 27 Jul 2021 16:53:45 -0700
Subject: [PATCH 1/3] Remove unecessary stuff in `.gitignore`

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e14561fe..870cb1c06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,9 +56,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/

From d64cb33e90a5d178222c4e8e3f49d44c33fd93ae Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Fri, 30 Jul 2021 10:34:28 -0700
Subject: [PATCH 2/3] Remove unused struct in `libstore`

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
---
 src/libstore/binary-cache-store.cc | 11 -----------
 1 file changed, 11 deletions(-)

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)

From 2de7a1fe673e7cc3dd05b7bcfef82681aaf620d4 Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Mon, 9 Aug 2021 10:08:07 -0700
Subject: [PATCH 3/3] libexpr: Squash similar conditions

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
---
 src/libexpr/primops.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index e8569b654..5ca6f6d01 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);
     }