diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-03 23:12:48 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-03 23:12:48 +0300 |
| commit | aadaa913792b0fdeb68b02425e4f03d2f8286a1f (patch) | |
| tree | ea582b078a00e6ba27e2c887a9df5a792c37fb0e /pkgs/development/libraries/openssl/default.nix | |
| parent | 2362891dc815160e343e52458f25db22508ac487 (diff) | |
| parent | e7d3166656af0d98da9f59c78e2213cec842d743 (diff) | |
| download | nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.gz nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.bz2 nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.lz nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.xz nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.zst nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix
Diffstat (limited to 'pkgs/development/libraries/openssl/default.nix')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 304b575eb92..157ce5fb9de 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -105,13 +105,13 @@ let in { openssl_1_0_1 = common { - version = "1.0.1s"; - sha256 = "e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511"; + version = "1.0.1t"; + sha256 = "4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088"; }; openssl_1_0_2 = common { - version = "1.0.2g"; - sha256 = "b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33"; + version = "1.0.2h"; + sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; }; } |