Merge pull request #12453 from NixOS/mergify/bp/2.26-maintenance/pr-1…

…2448 copyPathToStore(): Preserve symlinks (backport #12448)
NixOS · Feb 11, 2025 · dfbd030 · dfbd030
2 parents 4c3786d + 83306bb
commit dfbd030
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
@@ -2384,7 +2384,7 @@ StorePath EvalState::copyPathToStore(NixStringContext & context, const SourcePat
         : [&]() {
             auto dstPath = fetchToStore(
                 *store,
-                path.resolveSymlinks(),
+                path.resolveSymlinks(SymlinkResolution::Ancestors),
                 settings.readOnlyMode ? FetchMode::DryRun : FetchMode::Copy,
                 path.baseName(),
                 ContentAddressMethod::Raw::NixArchive,

diff --git a/tests/functional/meson.build b/tests/functional/meson.build
@@ -164,6 +164,7 @@ suites = [
       'debugger.sh',
       'extra-sandbox-profile.sh',
       'help.sh',
+      'symlinks.sh',
     ],
     'workdir': meson.current_source_dir(),
   },

diff --git a/tests/functional/simple.sh b/tests/functional/simple.sh
@@ -15,7 +15,7 @@ echo "output path is $outPath"
 [[ ! -w $outPath ]]
 
 text=$(cat "$outPath/hello")
-if test "$text" != "Hello World!"; then exit 1; fi
+[[ "$text" = "Hello World!" ]]
 
 TODO_NixOS
 

diff --git a/tests/functional/symlinks.sh b/tests/functional/symlinks.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source common.sh
+
+# Check that when we have a derivation attribute that refers to a
+# symlink, we copy the symlink, not its target.
+# shellcheck disable=SC2016
+nix build --impure --no-link --expr '
+  with import ./config.nix;
+
+  mkDerivation {
+    name = "simple";
+    builder = builtins.toFile "builder.sh" "[[ -L \"$symlink\" ]]; mkdir $out";
+    symlink = ./lang/symlink-resolution/foo/overlays;
+  }
+'