From 3a2fc9ce1dd3b176bdef257be75439bde33c210a Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 14 Oct 2021 15:42:54 +0200
Subject: [PATCH 1/3] Fix the `isDaemonNewer` check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Don’t hardcode the “newer” version
- Remove an ill-placed `return`
---
 tests/common.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/common.sh.in b/tests/common.sh.in
index 7daab2460..08f5e0a77 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -126,7 +126,7 @@ isDaemonNewer () {
   [[ -n "${NIX_DAEMON_PACKAGE:-}" ]] || return 0
   local requiredVersion="$1"
   local daemonVersion=$($NIX_DAEMON_PACKAGE/bin/nix-daemon --version | cut -d' ' -f3)
-  return [[ $(nix eval --expr "builtins.compareVersions ''$daemonVersion'' ''2.4''") -ge 0 ]]
+  [[ $(nix eval --expr "builtins.compareVersions ''$daemonVersion'' ''$requiredVersion''") -ge 0 ]]
 }
 
 requireDaemonNewerThan () {

From b598e5c47c0e98b45de00b488707f4f92fc093eb Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 14 Oct 2021 16:00:59 +0200
Subject: [PATCH 2/3] Fix the min bound for the structured-attrs test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The min bound written corresponds to the date of the commit that
introduced the change, but it only got merged on master some weeks
later. Since the version is essentially the commit date, that means that
there’s a whole range of commits on master (including the current
`nixUnstable`) that have a higher version but don’t contain the required
change.
---
 tests/structured-attrs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/structured-attrs.sh b/tests/structured-attrs.sh
index e585ce37f..378dbc735 100644
--- a/tests/structured-attrs.sh
+++ b/tests/structured-attrs.sh
@@ -2,7 +2,7 @@ source common.sh
 
 # 27ce722638 required some incompatible changes to the nix file, so skip this
 # tests for the older versions
-requireDaemonNewerThan "2.4pre20210622"
+requireDaemonNewerThan "2.4pre20210712"
 
 clearStore
 

From 0b55c8767dfa15540f47579442350ffad51fc047 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 15 Oct 2021 14:15:43 +0200
Subject: [PATCH 3/3] Disable the eval-store test when using the daemon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using the daemon will break most of the assumptions of this test, so
it’s as simple to just disable it
---
 tests/eval-store.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/eval-store.sh b/tests/eval-store.sh
index 9ab7a87be..679da5741 100644
--- a/tests/eval-store.sh
+++ b/tests/eval-store.sh
@@ -1,6 +1,8 @@
 source common.sh
 
-requireDaemonNewerThan "2.4pre20210727"
+# Using `--eval-store` with the daemon will eventually copy everything
+# to the build store, invalidating most of the tests here
+needLocalStore
 
 eval_store=$TEST_ROOT/eval-store