lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

Update ssl-cert-file docs (#671)

Browse source
This commit is contained in:
Daniel Flanagan 2023-10-10 11:21:22 -05:00 committed by GitHub
parent 201fd4a0a7
commit 5e06d6fcd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -424,7 +424,7 @@ Differing from the upstream [Nix](https://github.com/NixOS/nix) installer script
* `extra-nix-path` is set to `nixpkgs=flake:nixpkgs` * `extra-nix-path` is set to `nixpkgs=flake:nixpkgs`
* an installation receipt (for uninstalling) is stored at `/nix/receipt.json` as well as a copy of the install binary at `/nix/nix-installer` * an installation receipt (for uninstalling) is stored at `/nix/receipt.json` as well as a copy of the install binary at `/nix/nix-installer`
* `nix-channel --update` is not run, `~/.nix-channels` is not provisioned * `nix-channel --update` is not run, `~/.nix-channels` is not provisioned
* `NIX_SSL_CERT_FILE` is set in the various shell profiles if the `ssl-cert-file` argument is used. * `ssl-cert-file` is set in `/etc/nix/nix.conf` if the `ssl-cert-file` argument is used.
## Motivations ## Motivations

2
src/settings.rs
View file

@ -183,7 +183,7 @@ pub struct CommonSettings {
#[cfg_attr(feature = "cli", clap(long, env = "NIX_INSTALLER_PROXY"))] #[cfg_attr(feature = "cli", clap(long, env = "NIX_INSTALLER_PROXY"))]
pub proxy: Option<Url>, pub proxy: Option<Url>,
/// An SSL cert to use (if any), used for fetching Nix and sets `NIX_SSL_CERT_FILE` for Nix /// An SSL cert to use (if any), used for fetching Nix and sets `ssl-cert-file` in `/etc/nix/nix.conf`
#[cfg_attr(feature = "cli", clap(long, env = "NIX_INSTALLER_SSL_CERT_FILE"))] #[cfg_attr(feature = "cli", clap(long, env = "NIX_INSTALLER_SSL_CERT_FILE"))]
pub ssl_cert_file: Option<PathBuf>, pub ssl_cert_file: Option<PathBuf>,