From 92082524a96f74f356fe821608ed48ef04f9bc2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 12:25:31 +0200 Subject: [PATCH] Revert "add OPENSSL_X509_CERT_FILE to the `git` command environment" This reverts commit 88b5578a579ca7eefc8ac5507f9a5be3cc3684ca because of the following issues: 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then its value will overwrite any settings the user may have configured in http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not supposed to have an effect on Git. 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO environment variable as documented in git-config(1), because anything set there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which might be empty). 3) The patch breaks other builds of packages that depend on Git, i.e. . --- .../version-management/git-and-tools/git/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index ce1344906208..f95b5a493a65 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -82,10 +82,6 @@ stdenv.mkDerivation { # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi - - wrapProgram $out/bin/git \ - --set GIT_SSL_CAINFO "\$OPENSSL_X509_CERT_FILE" - '' + (if svnSupport then