Author: NicolasPierron
Date: Sun Aug 28 16:03:14 2011
New Revision: 28857
URL: https://svn.nixos.org/websvn/nix/?rev=28857&sc=1
Log:
fetchgit: Handle https.
Modified:
nixpkgs/trunk/pkgs/build-support/fetchgit/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/fetchgit/default.nix Sun Aug 28
16:02:18 2011 (r28856)
+++ nixpkgs/trunk/pkgs/build-support/fetchgit/default.nix Sun Aug 28
16:03:14 2011 (r28857)
@@ -1,4 +1,4 @@
-{stdenv, git}:
+{stdenv, git, cacert}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }:
/* NOTE:
@@ -35,6 +35,8 @@
inherit url rev leaveDotGit;
+ GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt";
+
impureEnvVars = [
# We borrow these environment variables from the caller to allow
# easy proxy configuration. This is impure, but a fixed-output
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Aug 28 16:02:18
2011 (r28856)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Aug 28 16:03:14
2011 (r28857)
@@ -261,7 +261,7 @@
};
fetchgit = import ../build-support/fetchgit {
- inherit stdenv git;
+ inherit stdenv git cacert;
};
fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
