git: respect $SSL_CERT_FILE #14617
Merged
git: respect $SSL_CERT_FILE #14617
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows git to work on systems without /etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failing with "error setting certificate verify locations".
| #if LIBCURL_VERSION_NUM >= 0x070908 | ||
| set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); | ||
| #endif | ||
| + set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); |
There was a problem hiding this comment.
maybe put it on the top of the list since it's non-standard. the official/documented envs should override the SSL_CERT_FILE if set.
There was a problem hiding this comment.
Actually, this doesn't override the GIT_SSL_CAPATH, it sets ssl_capath, not ssl_cainfo, which is set below.
|
I think it's a good idea but would like a second opinion on this. /cc @vcunat |
|
Right now, nixpkgs.git is unusable on OS X by default without this. (also, is there so much stuff that depends on git that isn't a fixed-output derivation?) |
|
Also, while we're at it, we could get rid of the custom env var in fetchgit perhaps: diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 7f98c97..9310e34 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
- GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
impureEnvVars = [
# We borrow these environment variables from the caller to allow |
|
Any concrete requests for changes to this patch? |
|
Nope, all good :) |
svend
added a commit
to svend/dotfiles
that referenced
this pull request
May 1, 2016
Uses SSL_CERT_FILE now: NixOS/nixpkgs#14617
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows git to work on systems without
/etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failingwith "error setting certificate verify locations".
Things done
nix-build --option build-use-chroot trueor nix.useChroot on NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)