summary refs log tree commit diff
path: root/pkgs/development/libraries/mbedtls/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
commitd9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch)
tree82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/development/libraries/mbedtls/default.nix
parent8b834605628fabd43b1b26a1724fb22c83150e2d (diff)
parent8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff)
downloadnixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries/mbedtls/default.nix')
-rw-r--r--pkgs/development/libraries/mbedtls/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index a1a096b096d..d99944228c7 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "mbedtls-${version}";
-  version = "2.11.0";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
     rev = name;
-    sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir";
+    sha256 = "09snlzlbn8yq95dnfbj2g5bh6y4q82xkaph7qp9ddnlqiaqcji2h";
   };
 
   nativeBuildInputs = [ cmake ninja perl ];