Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9dc9b64aadad
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32a0a223d589
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 19, 2018

  1. Look inside the user profile

    @luke-clifton
    luke-clifton committed Sep 19, 2018
    Copy the full SHA
    1241a58 View commit details

  2. Search NIX_PROFILE for SSL CA

    @luke-clifton
    luke-clifton committed Sep 19, 2018
    Copy the full SHA
    fb72104 View commit details

Commits on Nov 15, 2018

  1. Merge pull request #2432 from luke-clifton/fixssl 

    SSL certificate search failed to find user profile certificates.
    @edolstra
    edolstra authored Nov 15, 2018
    Copy the full SHA
    32a0a22 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 scripts/nix-profile-daemon.sh.in
11 changes: 7 additions & 4 deletions scripts/nix-profile-daemon.sh.in
View file
Original file line number Diff line number Diff line change
@@ -61,10 +61,13 @@ elif [ -e /etc/ssl/certs/ca-bundle.crt ]; then # Old NixOS
export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
elif [ -e /etc/pki/tls/certs/ca-bundle.crt ]; then # Fedora, CentOS
export NIX_SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt
elif [ -e "$NIX_USER_PROFILE_DIR/etc/ssl/certs/ca-bundle.crt" ]; then # fall back to cacert in the user's Nix profile
export NIX_SSL_CERT_FILE=$NIX_USER_PROFILE_DIR/etc/ssl/certs/ca-bundle.crt
elif [ -e "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" ]; then # fall back to cacert in the default Nix profile
export NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
else
# Fall back to what is in the nix profiles, favouring whatever is defined last.
for i in $NIX_PROFILES; do
if [ -e $i/etc/ssl/certs/ca-bundle.crt ]; then
export NIX_SSL_CERT_FILE=$i/etc/ssl/certs/ca-bundle.crt
fi
done
fi

export NIX_PATH="nixpkgs=@localstatedir@/nix/profiles/per-user/root/channels/nixpkgs:@localstatedir@/nix/profiles/per-user/root/channels"