Merge remote-tracking branch 'upstream/master' into hardened-stdenv

1 files changed, 5 insertions, 5 deletions

diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index b2500d1f49be3..4a612c5351dcd 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchgit, cmake, perl }:
+{ stdenv, fetchgit, cmake, perl, go }:
 
 stdenv.mkDerivation rec {
   name = "boringssl-${version}";
-  version = "20140820-a7d1363f";
+  version = "2016-03-08";
 
   src = fetchgit {
     url    = "https://boringssl.googlesource.com/boringssl";
-    rev    = "a7d1363fcb1f0d825ec2393c06be3d58b0c57efd";
-    sha256 = "d27dd1416de1a2ea4ec2c219248b2ed2cce5c0405e56adb394077ddc7c319bab";
+    rev    = "bfb38b1a3c5e37d43188bbd02365a87bebc8d122";
+    sha256 = "0g9gh915ywawqf1gq7pwkhrhbh79w7si4g34ryml7a6mnmvx8b52";
   };
 
-  buildInputs = [ cmake perl ];
+  buildInputs = [ cmake perl go ];
   enableParallelBuilding = true;
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";