Merge e5d4435cf1 into c2fc0762bb

Merge pull request #241 from sternenseemann/nix-2.3-install-check
agenix: fix installCheckPhase with Nix 2.3
2024-08-17 01:50:24 +03:00 · 2024-05-25 02:38:46 +02:00 · 2024-05-24 08:40:46 -06:00 · 2024-02-01 13:30:22 +01:00 · 2023-11-15 18:26:54 +00:00
2 changed files with 7 additions and 2 deletions
--- a/modules/age-home.nix
+++ b/modules/age-home.nix
@ -211,6 +211,7 @@ in {
    systemd.user.services.agenix = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
      Unit = {
        Description = "agenix activation";
+        After = "basic.target"  # “basic boot-up,” includes impermanence's bind mounts
      };
      Service = {
        Type = "oneshot";
--- a/pkgs/agenix.nix
+++ b/pkgs/agenix.nix
@ -30,9 +30,13 @@ in
      shellcheck ${bin}
      ${bin} -h | grep ${version}

-      HOME=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')
+      test_tmp=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')
+      export HOME="$test_tmp/home"
+      export NIX_STORE_DIR="$test_tmp/nix/store"
+      export NIX_STATE_DIR="$test_tmp/nix/var"
+      mkdir -p "$HOME" "$NIX_STORE_DIR" "$NIX_STATE_DIR"
      function cleanup {
-        rm -rf $HOME
+        rm -rf "$test_tmp"
      }
      trap "cleanup" 0 2 3 15
Author	SHA1	Message	Date
nicoo	da4c0acaf0	Merge `e5d4435cf1` into `c2fc0762bb`	2024-05-25 02:38:46 +02:00
Nathan Henrie	c2fc0762bb	Merge pull request #241 from sternenseemann/nix-2.3-install-check agenix: fix installCheckPhase with Nix 2.3	2024-05-24 08:40:46 -06:00
sternenseemann	1746e4f5ec	agenix: fix installCheckPhase with Nix 2.3 As opposed to e.g. Nix 2.18, Nix 2.3 doesn't try to create a fallback store in $HOME if $NIX_STORE_DIR and $NIX_STATE_DIR aren't writable.	2024-02-01 13:30:22 +01:00
nicoo	e5d4435cf1	age-home: Order `agenix.service` after `basic.target` Closes #219	2023-11-15 18:26:54 +00:00