openssl_1_1_0: init at 1.1.0

This commit is contained in:
Robin Gloster 2016-08-26 07:38:19 +00:00
parent b9a4da47c0
commit b6dabe3df0
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 8 additions and 2 deletions

View File

@ -17,7 +17,7 @@ let
};
patches =
[ ./use-etc-ssl-certs.patch ]
optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch
++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
++ optional
(versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))
@ -114,4 +114,9 @@ in {
sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919";
};
openssl_1_1_0 = common {
version = "1.1.0";
sha256 = "10lcpmnxap9nw8ymdglys93cgkwd1lf1rz4fhq5whwhlmkwrzipm";
};
}

View File

@ -9006,7 +9006,8 @@ in
};
})
openssl_1_0_1
openssl_1_0_2;
openssl_1_0_2
openssl_1_1_0;
openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix {
cryptodevHeaders = linuxPackages.cryptodev.override {