fix(3p/overlays): fix home-manager compatibility with Nix 2.3
Change-Id: I769204dc480531d3d40b3907c583a1114dde0a20 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13169 Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
parent
4d51d9e408
commit
deae47c7cb
2 changed files with 33 additions and 0 deletions
32
third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch
vendored
Normal file
32
third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
From 949776a927faf69887ba71eb339762381e90e105 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vincent Ambo <mail@tazj.in>
|
||||||
|
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 fffb3b1c..d12f143a 100644
|
||||||
|
--- a/modules/home-environment.nix
|
||||||
|
+++ b/modules/home-environment.nix
|
||||||
|
@@ -728,13 +728,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}
|
||||||
|
|
||||||
|
${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.47.2
|
||||||
|
|
||||||
1
third_party/overlays/tvl.nix
vendored
1
third_party/overlays/tvl.nix
vendored
|
|
@ -29,6 +29,7 @@ depot.nix.readTree.drvTargets {
|
||||||
|
|
||||||
home-manager = super.home-manager.overrideAttrs (_: {
|
home-manager = super.home-manager.overrideAttrs (_: {
|
||||||
src = depot.third_party.sources.home-manager;
|
src = depot.third_party.sources.home-manager;
|
||||||
|
patches = [ ./patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch ];
|
||||||
version = "git-"
|
version = "git-"
|
||||||
+ builtins.substring 0 7 depot.third_party.sources.home-manager.rev;
|
+ builtins.substring 0 7 depot.third_party.sources.home-manager.rev;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue