From d6c871eb2d418461e56c1113ef6bcafb06fb51e3 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 9 Mar 2025 13:18:46 +0100
Subject: [PATCH] libstore/gc: restore deletion of referrers

Fixes: 8614cf13344eca75074cd4af20fd90238571b0b6
Fixes #495

Change-Id: I4d8d655c6254786ba1222a5b37551c68d9e370ee
---
 doc/manual/rl-next/delete-referrers.md | 13 +++++++++++
 lix/libstore/gc.cc                     |  4 ----
 tests/functional/gc.sh                 | 30 ++++++++++++++++----------
 3 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 doc/manual/rl-next/delete-referrers.md

diff --git a/doc/manual/rl-next/delete-referrers.md b/doc/manual/rl-next/delete-referrers.md
new file mode 100644
index 000000000..5b3cbabd5
--- /dev/null
+++ b/doc/manual/rl-next/delete-referrers.md
@@ -0,0 +1,13 @@
+---
+synopsis: "Fix nix-store --delete on paths with remaining referrers"
+cls: [2783]
+category: "Fixes"
+credits: lheckemann
+---
+
+Nix 2.5 introduced a regression whereby `nix-store --delete` and `nix
+store delete` started to fail when trying to delete a path that was
+still referenced by other paths, even if the referrers were not
+reachable from any GC roots. The old behaviour, where attempting to
+delete a store path would also delete its referrer closure, is now
+restored.
diff --git a/lix/libstore/gc.cc b/lix/libstore/gc.cc
index b5a7ffc4c..5e9c14bb3 100644
--- a/lix/libstore/gc.cc
+++ b/lix/libstore/gc.cc
@@ -749,10 +749,6 @@ try {
                     co_return result::success();
                 }
 
-                if (options.action == GCOptions::gcDeleteSpecific
-                    && !options.pathsToDelete.count(*path))
-                    co_return result::success();
-
                 if (!gcServer.markPendingIfPresent(std::string(path->hashPart()))) {
                     debug("cannot delete '%s' because it's a temporary root", printStorePath(*path));
                     TRY_AWAIT(markAlive());
diff --git a/tests/functional/gc.sh b/tests/functional/gc.sh
index ad09a8b39..4923dc069 100644
--- a/tests/functional/gc.sh
+++ b/tests/functional/gc.sh
@@ -2,12 +2,16 @@ source common.sh
 
 clearStore
 
-drvPath=$(nix-instantiate dependencies.nix)
-outPath=$(nix-store -rvv "$drvPath")
+createAndRootPaths() {
+  drvPath=$(nix-instantiate dependencies.nix)
+  outPath=$(nix-store -rvv "$drvPath")
 
-# Set a GC root.
-rm -f "$NIX_STATE_DIR"/gcroots/foo
-ln -sf $outPath "$NIX_STATE_DIR"/gcroots/foo
+  # Set a GC root.
+  rm -f "$NIX_STATE_DIR"/gcroots/foo
+  ln -sf $outPath "$NIX_STATE_DIR"/gcroots/foo
+}
+
+createAndRootPaths
 
 [ "$(nix-store -q --roots $outPath)" = "$NIX_STATE_DIR/gcroots/foo -> $outPath" ]
 
@@ -18,9 +22,9 @@ if nix-store --gc --print-dead | grep -E $outPath$; then false; fi
 
 nix-store --gc --print-dead
 
-inUse=$(readLink $outPath/reference-to-input-2)
-if nix-store --delete $inUse; then false; fi
-test -e $inUse
+input2=$(readLink $outPath/reference-to-input-2)
+if nix-store --delete $input2; then false; fi
+test -e $input2
 
 if nix-store --delete $outPath; then false; fi
 test -e $outPath
@@ -42,10 +46,14 @@ if test -e $drvPath; then false; fi
 
 rm "$NIX_STATE_DIR"/gcroots/foo
 
-nix-collect-garbage
+# Deleting the dependency should now be possible, and delete the referrer as well
+nix-store --delete $input2
+! test -e $outPath
+! test -e $input2
 
-# Check that the output has been GC'd.
-if test -e $outPath/foobar; then false; fi
+createAndRootPaths
+rm "$NIX_STATE_DIR"/gcroots/foo
+nix-collect-garbage
 
 # Check that the store is empty.
 rmdir $NIX_STORE_DIR/.links