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

openssl: 1.1.0 -> 1.1.1 (#46524)

Browse Source
This commit is contained in:
Alyssa Ross
2018-09-12 23:56:08 +00:00
committed by Orivej Desh (NixOS)
parent 89e52157c8
commit 1ec301ded2
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/openssl/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPackages, perl
{ stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodevHeaders
, enableSSL2 ? false
, static ? false
@@ -31,6 +31,8 @@ let
substituteInPlace "$a" \
--replace /bin/rm rm
done
'' + optionalString (versionAtLeast version "1.1.1") ''
substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env'
'' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
@@ -125,9 +127,9 @@ in {
sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah";
};
openssl_1_1_0 = common {
version = "1.1.0i";
sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb";
openssl_1_1 = common {
version = "1.1.1";
sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
};
}