From 12fa019ae558641df0a23a7973d64e687b2d8ba8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 4 Sep 2024 21:43:59 +0200
Subject: [PATCH 01/11] NAR parser: Fix check for duplicate / incorrectly
 sorted entries

"prevName" was always empty because it was declared in the wrong scope.

(cherry picked from commit 495d32e1b8e5d5143f048d1be755a96bea822b19)
---
 src/libutil/archive.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index e2ebcda0c..353760398 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -214,11 +214,13 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
             else if (t == "directory") {
                 sink.createDirectory(path);
 
+                std::string prevName;
+
                 while (1) {
                     s = getString();
 
                     if (s == "entry") {
-                        std::string name, prevName;
+                        std::string name;
 
                         s = getString();
                         if (s != "(") throw badArchive("expected open tag");

From 6187ee468f1ffd5ff4f931b9e027e718d12f9f20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 16:41:15 +0200
Subject: [PATCH 02/11] Add test case for NARs with duplicate directory entries

This test was made by @puckipedia.

(cherry picked from commit 83d5b32803e5b828967a27b1ea93c5728d3a4d0a)
---
 tests/functional/duplicate.nar             | Bin 0 -> 1400 bytes
 tests/functional/local.mk                  |   2 +-
 tests/functional/{case-hack.sh => nars.sh} |   9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 tests/functional/duplicate.nar
 rename tests/functional/{case-hack.sh => nars.sh} (79%)

diff --git a/tests/functional/duplicate.nar b/tests/functional/duplicate.nar
new file mode 100644
index 0000000000000000000000000000000000000000..1d0993ed4cab41a6d45907ac0c17026afd5471a2
GIT binary patch
literal 1400
zcmdT@+it=z49zZ#4T*h25D#ojRW<Ex|G@`@V9{u8GC9tmf4`7ALVKttBt%7C>~kz9
z$BsP}-LYn0DAbktf#N+<H_X4Vy=P19Hyqq2#v6m6$zjWQ#1<?iuJ0bJnsiT&E6&UB
zShx8T@6$2nJl{68v0vhWF)7>v9qTBW&+onV;7jX2S0C@V9t<{lr}pt&I-XgF4v29E
z3g3EyMu?&G+_E0O>ztu<<o{WlVgD!B-+)UU$@tWLL)eB|p_p)gVGlZxTGwf7nT+O<
wUF|HzdGK$H=d&`lqV&}Sbmin?X&o62UIvui%q-<<x00V9i<I%--d<b$7fb(t*#H0l

literal 0
HcmV?d00001

diff --git a/tests/functional/local.mk b/tests/functional/local.mk
index 8b4945cac..f61823765 100644
--- a/tests/functional/local.mk
+++ b/tests/functional/local.mk
@@ -90,7 +90,7 @@ nix_tests = \
   derivation-advanced-attributes.sh \
   import-derivation.sh \
   nix_path.sh \
-  case-hack.sh \
+  nars.sh \
   placeholders.sh \
   ssh-relay.sh \
   build.sh \
diff --git a/tests/functional/case-hack.sh b/tests/functional/nars.sh
similarity index 79%
rename from tests/functional/case-hack.sh
rename to tests/functional/nars.sh
index feddc6583..c58d12cd5 100755
--- a/tests/functional/case-hack.sh
+++ b/tests/functional/nars.sh
@@ -6,13 +6,14 @@ TODO_NixOS
 
 clearStore
 
-rm -rf "$TEST_ROOT/case"
-
-opts=("--option" "use-case-hack" "true")
+# Check that NARs with duplicate directory entries are rejected.
+rm -rf "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "NAR directory is not sorted"
 
 # Check whether restoring and dumping a NAR that contains case
 # collisions is round-tripping, even on a case-insensitive system.
-
+rm -rf "$TEST_ROOT/case"
+opts=("--option" "use-case-hack" "true")
 nix-store "${opts[@]}" --restore "$TEST_ROOT/case" < case.nar
 nix-store "${opts[@]}" --dump "$TEST_ROOT/case" > "$TEST_ROOT/case.nar"
 cmp case.nar "$TEST_ROOT/case.nar"

From f160d3ac68f67497f7f4948fa7a236790c7fee12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 16:48:43 +0200
Subject: [PATCH 03/11] Test that nix-store --restore fails if the output
 already exists

This restores the behaviour from before the std::filesystem
refactorings.

(cherry picked from commit da1ad28912334bb57f923afb4745273fd68f695c)
---
 src/libutil/fs-sink.cc   | 3 ++-
 tests/functional/nars.sh | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libutil/fs-sink.cc b/src/libutil/fs-sink.cc
index f15324d0a..696cd17ea 100644
--- a/src/libutil/fs-sink.cc
+++ b/src/libutil/fs-sink.cc
@@ -71,7 +71,8 @@ static GlobalConfig::Register r1(&restoreSinkSettings);
 
 void RestoreSink::createDirectory(const CanonPath & path)
 {
-    std::filesystem::create_directory(dstPath / path.rel());
+    if (!std::filesystem::create_directory(dstPath / path.rel()))
+        throw Error("path '%s' already exists", (dstPath / path.rel()).string());
 };
 
 struct RestoreRegularFile : CreateRegularFileSink {
diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index c58d12cd5..106bd10fc 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -10,6 +10,9 @@ clearStore
 rm -rf "$TEST_ROOT/out"
 expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "NAR directory is not sorted"
 
+# Check that nix-store --restore fails if the output already exists.
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out/' already exists"
+
 # Check whether restoring and dumping a NAR that contains case
 # collisions is round-tripping, even on a case-insensitive system.
 rm -rf "$TEST_ROOT/case"

From 0cfc9bf1334a340b2123221e9fead71ab2b3307e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 16:54:12 +0200
Subject: [PATCH 04/11] More tests

(cherry picked from commit 77c090cdbd56220895a2447efae79f68ed7861c5)
---
 tests/functional/nars.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index 106bd10fc..b2b6b2b1a 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -13,6 +13,17 @@ expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet
 # Check that nix-store --restore fails if the output already exists.
 expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out/' already exists"
 
+rm -rf "$TEST_ROOT/out"
+echo foo > "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "cannot create directory.*File exists"
+
+rm -rf "$TEST_ROOT/out"
+ln -s "$TEST_ROOT/out2" "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "cannot create directory.*File exists"
+
+mkdir -p "$TEST_ROOT/out2"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out/' already exists"
+
 # Check whether restoring and dumping a NAR that contains case
 # collisions is round-tripping, even on a case-insensitive system.
 rm -rf "$TEST_ROOT/case"

From 12889704966afa417a1c9044755665646f9c2872 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 19:26:10 +0200
Subject: [PATCH 05/11] Detect NAR directory entries that collide with another
 path after case-hacking

The test was made by @puckipedia.

(cherry picked from commit 35575873813f60fff26f27a65e09038986f17cb5)
---
 src/libutil/archive.cc              |   3 +++
 tests/functional/case-collision.nar | Bin 0 -> 1928 bytes
 tests/functional/nars.sh            |   6 ++++++
 3 files changed, 9 insertions(+)
 create mode 100644 tests/functional/case-collision.nar

diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index 353760398..849bfe022 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -243,6 +243,9 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
                                         debug("case collision between '%1%' and '%2%'", i->first, name);
                                         name += caseHackSuffix;
                                         name += std::to_string(++i->second);
+                                        auto j = names.find(name);
+                                        if (j != names.end())
+                                            throw Error("NAR contains file name '%s' that collides with case-hacked file name '%s'", prevName, j->first);
                                     } else
                                         names[name] = 0;
                                 }
diff --git a/tests/functional/case-collision.nar b/tests/functional/case-collision.nar
new file mode 100644
index 0000000000000000000000000000000000000000..2eff86901c617be2a830d23074923cb5b3b69aa3
GIT binary patch
literal 1928
zcmd^9%}&EG3@&2)Y!WvfAc(_YXsQr5o`XF=mU?TnHklH4TQ7Zf(qMC#G>KJ{av&Gy
za}?+EXU7lO&ocTjmrj*>2lMyfx+4Dz*%4W6x6p6LgbVFJp>-|c8?s<9`cB0$vW{^$
z?iYCMuQE2ai07y7GmkrZ&%wH>q|5FJD{C-t@C1MJc_jzOWqdC0M~c()?t*xok{-HJ
zs!i9+H#iU9)|ED!?3UuAbZZF8FyEZ~jG6y2J~toM9S7FoQvGmE`2|Vij(PpHA1=*f
z7ka8+sd=Q<ga6gm*_E!qr_zJ}djTuiRG7RjOKp<&2iKtnyC2f0tS8UUNz5k8-~g&Y
zxvb(8CTB3*2RvWj=;-+=4^rg5oPa8=n9htvt-y=M3Ez5zdL|b8h4}oK#v8};>c8V}
DaOkrB

literal 0
HcmV?d00001

diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index b2b6b2b1a..f2339af88 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -37,3 +37,9 @@ cmp case.nar "$TEST_ROOT/case.nar"
 # removal of the suffix).
 touch "$TEST_ROOT/case/xt_CONNMARK.h~nix~case~hack~3"
 (! nix-store "${opts[@]}" --dump "$TEST_ROOT/case" > /dev/null)
+
+# Detect NARs that have a directory entry that after case-hacking
+# collides with another entry (e.g. a directory containing 'Test',
+# 'Test~nix~case~hack~1' and 'test').
+rm -rf "$TEST_ROOT/case"
+expectStderr 1 nix-store "${opts[@]}" --restore "$TEST_ROOT/case" < case-collision.nar | grepQuiet "NAR contains file name 'test' that collides with case-hacked file name 'Test~nix~case~hack~1'"

From a041688133e69016b94110c76719813e11135365 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 20:37:26 +0200
Subject: [PATCH 06/11] Test that deserializing NARs with names with equal
 Unicode normal forms fails on macOS

The test is based on the one by @puckipedia but with the file names
swapped to make them sorted.

(cherry picked from commit 7a765a6aafa27267659eb7339cf7039990f30caa)
---
 tests/functional/nars.sh          |  11 +++++++++++
 tests/functional/unnormalized.nar | Bin 0 -> 1728 bytes
 2 files changed, 11 insertions(+)
 create mode 100644 tests/functional/unnormalized.nar

diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index f2339af88..b16650e7e 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -43,3 +43,14 @@ touch "$TEST_ROOT/case/xt_CONNMARK.h~nix~case~hack~3"
 # 'Test~nix~case~hack~1' and 'test').
 rm -rf "$TEST_ROOT/case"
 expectStderr 1 nix-store "${opts[@]}" --restore "$TEST_ROOT/case" < case-collision.nar | grepQuiet "NAR contains file name 'test' that collides with case-hacked file name 'Test~nix~case~hack~1'"
+
+# Deserializing a NAR that contains file names that Unicode-normalize
+# to the same name should fail on macOS but succeed on Linux.
+rm -rf "$TEST_ROOT/out"
+if [[ $(uname) = Darwin ]]; then
+    expectStderr 1 nix-store --restore "$TEST_ROOT/out" < unnormalized.nar | grepQuiet "cannot create directory.*File exists"
+else
+    nix-store --restore "$TEST_ROOT/out" < unnormalized.nar
+    [[ -e $TEST_ROOT/out/â ]]
+    [[ -e $TEST_ROOT/out/â ]]
+fi
diff --git a/tests/functional/unnormalized.nar b/tests/functional/unnormalized.nar
new file mode 100644
index 0000000000000000000000000000000000000000..4b7edb17e0b4a9b75cf2958e9f12cceca22d267c
GIT binary patch
literal 1728
zcmd^9&2GXl4DNo}ka&koJMc51YTAwW-~mEvXhfQz#07fgQFxVI_fQML(N5J=2`NbQ
zV*7LLe6bx5vh%0qe#)&V<rb!&9=aoZMDmd&HXAspuVfd}f<R*%vY$wT#(=fu(Yy+I
z9_WAma|l{IN1Gz}+u|dS9>u$+Qc|z8XR?vo72w}Ja>8T2af{uR|2^gTKAx4X{4ZTc
z-^V~CHIFT~SHUB7Jzi)&Hr6bq0+*^U@tqW~<h8;q6_5Dd7g8skk9hwI%<e=a+FkdK
zg;lNmtoNzUum@2iU#PIX2=pS(fiN2VZgd~ydVkA(DRNi#L6n9KC)%JC;8<;$YaBu~
SVe{Rb&Ax^q;=lcMYyMvevzzY#

literal 0
HcmV?d00001


From d9b60b390252304249afbb32e66a0436d6370194 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 20:55:24 +0200
Subject: [PATCH 07/11] Fix test on macOS

(cherry picked from commit 21dcbd7e83929fbf8b6c666d743afa0a9ea73d83)
---
 tests/functional/nars.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index b16650e7e..bd2c49fce 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -48,7 +48,7 @@ expectStderr 1 nix-store "${opts[@]}" --restore "$TEST_ROOT/case" < case-collisi
 # to the same name should fail on macOS but succeed on Linux.
 rm -rf "$TEST_ROOT/out"
 if [[ $(uname) = Darwin ]]; then
-    expectStderr 1 nix-store --restore "$TEST_ROOT/out" < unnormalized.nar | grepQuiet "cannot create directory.*File exists"
+    expectStderr 1 nix-store --restore "$TEST_ROOT/out" < unnormalized.nar | grepQuiet "path '.*/out/â' already exists"
 else
     nix-store --restore "$TEST_ROOT/out" < unnormalized.nar
     [[ -e $TEST_ROOT/out/â ]]

From 25510ba66f31dce539796d0101cfee8c52e2752d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Sep 2024 22:21:53 +0200
Subject: [PATCH 08/11] RestoreSink::createDirectory(): Use append()

On macOS, `mkdir("x/')` behaves differently than `mkdir("x")` if `x` is
a dangling symlink (the formed succeed while the latter fails). So make
sure we always strip the trailing slash.

(cherry picked from commit 9fcb588dd8a7b3f0d7d103cea449abcf9f736ad6)
---
 src/libutil/fs-sink.cc   | 20 ++++++++++----------
 tests/functional/nars.sh |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/libutil/fs-sink.cc b/src/libutil/fs-sink.cc
index 696cd17ea..a08cb0a4c 100644
--- a/src/libutil/fs-sink.cc
+++ b/src/libutil/fs-sink.cc
@@ -68,11 +68,19 @@ static RestoreSinkSettings restoreSinkSettings;
 
 static GlobalConfig::Register r1(&restoreSinkSettings);
 
+static std::filesystem::path append(const std::filesystem::path & src, const CanonPath & path)
+{
+    auto dst = src;
+    if (!path.rel().empty())
+        dst /= path.rel();
+    return dst;
+}
 
 void RestoreSink::createDirectory(const CanonPath & path)
 {
-    if (!std::filesystem::create_directory(dstPath / path.rel()))
-        throw Error("path '%s' already exists", (dstPath / path.rel()).string());
+    auto p = append(dstPath, path);
+    if (!std::filesystem::create_directory(p))
+        throw Error("path '%s' already exists", p.string());
 };
 
 struct RestoreRegularFile : CreateRegularFileSink {
@@ -83,14 +91,6 @@ struct RestoreRegularFile : CreateRegularFileSink {
     void preallocateContents(uint64_t size) override;
 };
 
-static std::filesystem::path append(const std::filesystem::path & src, const CanonPath & path)
-{
-    auto dst = src;
-    if (!path.rel().empty())
-        dst /= path.rel();
-    return dst;
-}
-
 void RestoreSink::createRegularFile(const CanonPath & path, std::function<void(CreateRegularFileSink &)> func)
 {
     auto p = append(dstPath, path);
diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index bd2c49fce..4f2470ea7 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -11,18 +11,18 @@ rm -rf "$TEST_ROOT/out"
 expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "NAR directory is not sorted"
 
 # Check that nix-store --restore fails if the output already exists.
-expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out/' already exists"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out' already exists"
 
 rm -rf "$TEST_ROOT/out"
 echo foo > "$TEST_ROOT/out"
-expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "cannot create directory.*File exists"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "File exists"
 
 rm -rf "$TEST_ROOT/out"
 ln -s "$TEST_ROOT/out2" "$TEST_ROOT/out"
-expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "cannot create directory.*File exists"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "File exists"
 
 mkdir -p "$TEST_ROOT/out2"
-expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out/' already exists"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out' already exists"
 
 # Check whether restoring and dumping a NAR that contains case
 # collisions is round-tripping, even on a case-insensitive system.

From e25410c7886a91167ca0ca2f496bf6bf17ee6510 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 6 Sep 2024 16:28:09 +0200
Subject: [PATCH 09/11] Test that deserializing regular files / symlinks is
 exclusive

(cherry picked from commit 52ba3cc5eac0418218a90c0cddb06688d4c7b5d3)
---
 tests/functional/nars.sh | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index 4f2470ea7..ed19637a1 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -24,6 +24,44 @@ expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet
 mkdir -p "$TEST_ROOT/out2"
 expectStderr 1 nix-store --restore "$TEST_ROOT/out" < duplicate.nar | grepQuiet "path '.*/out' already exists"
 
+# The same, but for a regular file.
+nix-store --dump ./nars.sh > "$TEST_ROOT/tmp.nar"
+
+rm -rf "$TEST_ROOT/out"
+nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
+rm -rf "$TEST_ROOT/out"
+mkdir -p "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
+rm -rf "$TEST_ROOT/out"
+ln -s "$TEST_ROOT/out2" "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
+mkdir -p "$TEST_ROOT/out2"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
+# The same, but for a symlink
+ln -sfn foo "$TEST_ROOT/symlink"
+nix-store --dump "$TEST_ROOT/symlink" > "$TEST_ROOT/tmp.nar"
+
+rm -rf "$TEST_ROOT/out"
+nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar"
+[[ -L "$TEST_ROOT/out" ]]
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
+rm -rf "$TEST_ROOT/out"
+mkdir -p "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
+rm -rf "$TEST_ROOT/out"
+ln -s "$TEST_ROOT/out2" "$TEST_ROOT/out"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
+mkdir -p "$TEST_ROOT/out2"
+expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
+
 # Check whether restoring and dumping a NAR that contains case
 # collisions is round-tripping, even on a case-insensitive system.
 rm -rf "$TEST_ROOT/case"

From 2e1cb495c1bf36d59c234d923a139c01a3866ee1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 9 Sep 2024 14:11:35 +0200
Subject: [PATCH 10/11] Typo

(cherry picked from commit 4cfa59fdb32aa4fcc58b735d8843ce308692a652)
---
 tests/functional/nars.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/nars.sh b/tests/functional/nars.sh
index ed19637a1..9f5f43dc6 100755
--- a/tests/functional/nars.sh
+++ b/tests/functional/nars.sh
@@ -42,7 +42,7 @@ expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | gre
 mkdir -p "$TEST_ROOT/out2"
 expectStderr 1 nix-store --restore "$TEST_ROOT/out" < "$TEST_ROOT/tmp.nar" | grepQuiet "File exists"
 
-# The same, but for a symlink
+# The same, but for a symlink.
 ln -sfn foo "$TEST_ROOT/symlink"
 nix-store --dump "$TEST_ROOT/symlink" > "$TEST_ROOT/tmp.nar"
 

From a6ad5565ef15a18ea2f60de4d57f75cd0175b167 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 9 Sep 2024 14:29:05 +0200
Subject: [PATCH 11/11] Improve use-case-hack description slightly

(cherry picked from commit 5ca2f58798e6f514b5194c16c0fea0d8ec128171)
---
 src/libutil/archive.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index 849bfe022..458438cbd 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -23,7 +23,7 @@ struct ArchiveSettings : Config
             false,
         #endif
         "use-case-hack",
-        "Whether to enable a Darwin-specific hack for dealing with file name collisions."};
+        "Whether to enable a macOS-specific hack for dealing with file name case collisions."};
 };
 
 static ArchiveSettings archiveSettings;