diff options
author | Alyssa Ross <hi@alyssa.is> | 2018-09-12 23:56:08 +0000 |
---|---|---|
committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2018-09-12 23:56:08 +0000 |
commit | 1ec301ded21cf12a861facc5fe029dc9bcc50593 (patch) | |
tree | 32767346d00d27e283eb5cae498976dda52ad6ff /pkgs/development | |
parent | 89e52157c8083a05065c7abfc9883c28f9e06639 (diff) | |
download | nixlib-1ec301ded21cf12a861facc5fe029dc9bcc50593.tar nixlib-1ec301ded21cf12a861facc5fe029dc9bcc50593.tar.gz nixlib-1ec301ded21cf12a861facc5fe029dc9bcc50593.tar.bz2 nixlib-1ec301ded21cf12a861facc5fe029dc9bcc50593.tar.lz nixlib-1ec301ded21cf12a861facc5fe029dc9bcc50593.tar.xz nixlib-1ec301ded21cf12a861facc5fe029dc9bcc50593.tar.zst nixlib-1ec301ded21cf12a861facc5fe029dc9bcc50593.zip |
openssl: 1.1.0 -> 1.1.1 (#46524)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index de13f963b674..87751188a03a 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -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"; }; } |