Skip to content

Commit

Permalink
Merge pull request #184 from cachix/macos-bump
Browse files Browse the repository at this point in the history
MacOS-12 fix & Nix 2.16.1
  • Loading branch information
domenkozar authored Jun 16, 2023
2 parents 16b9514 + e278794 commit 6ed004b
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions install-nix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ add_config() {
}
# Set jobs to number of cores
add_config "max-jobs = auto"
if [[ $OSTYPE =~ darwin ]]; then
add_config "ssl-cert-file = /etc/ssl/cert.pem"
fi
# Allow binary caches for user
add_config "trusted-users = root ${USER:-}"
# Add github access token
Expand Down Expand Up @@ -66,7 +69,7 @@ echo "installer options: ${installer_options[*]}"

# There is --retry-on-errors, but only newer curl versions support that
curl_retries=5
while ! curl -sS -o "$workdir/install" -v --fail -L "${INPUT_INSTALL_URL:-https://releases.nixos.org/nix/nix-2.15.1/install}"
while ! curl -sS -o "$workdir/install" -v --fail -L "${INPUT_INSTALL_URL:-https://releases.nixos.org/nix/nix-2.16.1/install}"
do
sleep 1
((curl_retries--))
Expand All @@ -78,14 +81,6 @@ done

sh "$workdir/install" "${installer_options[@]}"

if [[ $OSTYPE =~ darwin ]]; then
# macOS needs certificates hints
cert_file=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
echo "NIX_SSL_CERT_FILE=$cert_file" >> "$GITHUB_ENV"
export NIX_SSL_CERT_FILE=$cert_file
sudo launchctl setenv NIX_SSL_CERT_FILE "$cert_file"
fi

# Set paths
echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
# new path for nix 2.14
Expand Down

0 comments on commit 6ed004b

Please sign in to comment.