Merge pull request #163 from cachix/fix-nix-2.14

Support new Nix 2.14 profile PATH
don't insist $USER needs to be set
2023-03-01 13:52:04 +08:00 · 2023-03-01 05:51:32 +00:00 · 2023-03-01 05:44:36 +00:00 · 2023-02-08 19:35:22 +07:00
1 changed files with 3 additions and 2 deletions
--- a/install-nix.sh
+++ b/install-nix.sh
@@ -20,7 +20,7 @@ add_config() {
 # Set jobs to number of cores
 add_config "max-jobs = auto"
 # Allow binary caches for user
-add_config "trusted-users = root $USER"
+add_config "trusted-users = root ${USER:-}"
 # Add github access token
 if [[ -n "${INPUT_GITHUB_ACCESS_TOKEN:-}" ]]; then
  add_config "access-tokens = github.com=$INPUT_GITHUB_ACCESS_TOKEN"
@@ -88,7 +88,8 @@ fi

 # Set paths
 echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
-echo "/nix/var/nix/profiles/per-user/$USER/profile/bin" >> "$GITHUB_PATH"
+# new path for nix 2.14
+echo "$HOME/.nix-profile/bin" >> "$GITHUB_PATH"

 if [[ $INPUT_NIX_PATH != "" ]]; then
  echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV"
Author	SHA1	Message	Date
Domen Kožar	29bd9290ef	Merge pull request #163 from cachix/fix-nix-2.14 Support new Nix 2.14 profile PATH	2023-03-01 13:52:04 +08:00
Domen Kožar	167742cb88	don't insist $USER needs to be set	2023-03-01 05:51:32 +00:00
Domen Kožar	3755e30bd2	Support new Nix 2.14 profile PATH	2023-03-01 05:44:36 +00:00
Domen Kožar	193b0d85f5	Merge pull request #159 from cachix/update-readme Update README for v19	2023-02-08 19:35:22 +07:00