Restore some things lost in the rebase

Makefile

@@ -42,6 +42,7 @@ endif
 ifeq ($(ENABLE_FUNCTIONAL_TESTS), yes)
 makefiles += \
   tests/functional/local.mk \
+  tests/functional/gc-external-daemon/local.mk \
   tests/functional/ca/local.mk \
   tests/functional/dyn-drv/local.mk \
   tests/functional/test-libstoreconsumer/local.mk \

flake.nix

@@ -156,7 +156,13 @@
             name = "nix-find-roots-${version}";
             inherit version;
 
-            src = "${self}/src/nix-find-roots";
+            src = fileset.toSource {
+              root = ./src/nix-find-roots;
+              fileset = /*fileset.intersect baseFiles (*/fileset.unions [
+                ./src/nix-find-roots/main.cc
+                ./src/nix-find-roots/lib
+              ]/*)*/;
+            };
 
             CXXFLAGS = prev.lib.optionalString prev.stdenv.hostPlatform.isStatic "-static";
 
@@ -384,7 +390,9 @@
         default = nix;
       } // (lib.optionalAttrs (builtins.elem system linux64BitSystems) {
         nix-static = nixpkgsFor.${system}.static.nix;
-        nix-find-roots = nixpkgsFor.${system}.static.nix-find-roots;
+
+        inherit (nixpkgsFor.${system}.static) nix-find-roots;
+
         dockerImage =
           let
             pkgs = nixpkgsFor.${system}.native;

src/libstore/gc.cc

@@ -2,6 +2,7 @@
 #include "globals.hh"
 #include "local-store.hh"
 #include "finally.hh"
+#include "find-roots.hh"
 #include "unix-domain-socket.hh"
 #include "signals.hh"
 
@@ -9,7 +10,6 @@
 // For shelling out to lsof
 # include "processes.hh"
 #endif
-#include "find-roots.hh"
 
 #include <functional>
 #include <queue>

tests/functional/gc-external-daemon/local.mk

@@ -0,0 +1,7 @@
+gc-external-daemon-tests := \
+  $(d)/gc-auto.sh \
+  $(d)/gc.sh \
+  $(d)/gc-concurrent.sh \
+  $(d)/gc-runtime.sh
+
+install-tests-groups += gc-external-daemon

tests/functional/local.mk

@@ -18,7 +18,6 @@ nix_tests = \
   flakes/flake-in-submodule.sh \
   gc.sh \
   nix-collect-garbage-d.sh \
-  gc-external-daemon/gc.sh \
   remote-store.sh \
   legacy-ssh-store.sh \
   lang.sh \
@@ -26,21 +25,18 @@ nix_tests = \
   experimental-features.sh \
   fetchMercurial.sh \
   gc-auto.sh \
-  gc-external-daemon/gc-auto.sh \
   user-envs.sh \
   user-envs-migration.sh \
   binary-cache.sh \
   multiple-outputs.sh \
   nix-build.sh \
   gc-concurrent.sh \
-  gc-external-daemon/gc-concurrent.sh \
   repair.sh \
   fixed.sh \
   export-graph.sh \
   timeout.sh \
   fetchGitRefs.sh \
   gc-runtime.sh \
-  gc-external-daemon/gc-runtime.sh \
   tarball.sh \
   fetchGit.sh \
   fetchurl.sh \

tests/gc-external-daemon/common.sh

@@ -1,6 +0,0 @@
-source ../common.sh
-
-enableFeatures "external-gc-daemon"
-echo "gc-socket-path = $NIX_GC_SOCKET_PATH" >> "$NIX_CONF_DIR"/nix.conf
-
-startGcDaemon

tests/gc-external-daemon/gc-auto.sh

@@ -1,5 +0,0 @@
-source common.sh
-
-cd ..
-source ./gc-auto.sh
-

tests/gc-external-daemon/gc-concurrent.sh

@@ -1,4 +0,0 @@
-source common.sh
-
-cd ..
-source ./gc-concurrent.sh

tests/gc-external-daemon/gc-runtime.sh

@@ -1,5 +0,0 @@
-source common.sh
-
-cd ..
-source ./gc-runtime.sh
-

tests/gc-external-daemon/gc.sh

@@ -1,4 +0,0 @@
-source common.sh
-
-cd ..
-source ./gc.sh