From 067458873dc1966b8b4fa2849f1e504cbd7be56f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 11 Mar 2025 10:36:21 +0300 Subject: [PATCH] fix(3p/overlays): revive home-manager 2.3 compat fix A similar fix was indeed merged upstream a year ago, but later partially reverted. Change-Id: I9c0ed259507511ca4e3180f752ba527ea9bca4f8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13241 Autosubmit: tazjin Tested-by: BuildkiteCI Reviewed-by: sterni --- ...nment-fix-compatibility-with-Nix-2.3.patch | 32 +++++++++++++++++++ third_party/overlays/tvl.nix | 1 + 2 files changed, 33 insertions(+) create mode 100644 third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch diff --git a/third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch b/third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch new file mode 100644 index 000000000..df437f12c --- /dev/null +++ b/third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch @@ -0,0 +1,32 @@ +From ade86998762034b7b8699c6f6919a40da902294d Mon Sep 17 00:00:00 2001 +From: Vincent Ambo +Date: Fri, 21 Feb 2025 17:45:23 +0300 +Subject: [PATCH] home-environment: fix compatibility with Nix 2.3 + +--- + modules/home-environment.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/home-environment.nix b/modules/home-environment.nix +index 652ac086..eacb8605 100644 +--- a/modules/home-environment.nix ++++ b/modules/home-environment.nix +@@ -755,13 +755,13 @@ in + + # Create a temporary GC root to prevent collection during activation. + trap 'run rm -f $VERBOSE_ARG "$newGenGcPath"' EXIT +- run --silence nix-store --realise "$newGenPath" --add-root "$newGenGcPath" ++ run --quiet nix-store --realise "$newGenPath" --add-root "$newGenGcPath" --indirect + + ${activationCmds} + + ${lib.optionalString (!config.uninstall) '' + # Create the "current generation" GC root. +- run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath" ++ run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath" --indirect + + if [[ -e "$legacyGenGcPath" ]]; then + run rm $VERBOSE_ARG "$legacyGenGcPath" +-- +2.48.1 + diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index f4011ff04..bdc12d9c4 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -41,6 +41,7 @@ depot.nix.readTree.drvTargets { home-manager = super.home-manager.overrideAttrs (_: { src = depot.third_party.sources.home-manager; + patches = [ ./patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch ]; version = "git-" + builtins.substring 0 7 depot.third_party.sources.home-manager.rev; });