public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
This commit is contained in:
Tuomas Tynkkynen
2016-05-03 23:12:48 +03:00
parent 2362891dc8 e7d3166656
commit aadaa91379
506 changed files with 31436 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/openssl/default.nix
View File

@@ -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";
};
}