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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/altcoins/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: { callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }:
rec { rec {
@ -90,7 +90,7 @@ rec {
zcash = callPackage ./zcash { zcash = callPackage ./zcash {
withGui = false; withGui = false;
openssl = openssl_1_1_0; openssl = openssl_1_1;
}; };
parity = callPackage ./parity { }; parity = callPackage ./parity { };

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPackages, perl { stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodevHeaders , withCryptodev ? false, cryptodevHeaders
, enableSSL2 ? false , enableSSL2 ? false
, static ? false , static ? false
@ -31,6 +31,8 @@ let
substituteInPlace "$a" \ substituteInPlace "$a" \
--replace /bin/rm rm --replace /bin/rm rm
done 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) '' '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
substituteInPlace crypto/async/arch/async_posix.h \ substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
@ -125,9 +127,9 @@ in {
sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah"; sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah";
}; };
openssl_1_1_0 = common { openssl_1_1 = common {
version = "1.1.0i"; version = "1.1.1";
sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb"; sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
}; };
} }

4
pkgs/tools/misc/powerline-rs/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }: { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "powerline-rs"; pname = "powerline-rs";
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
nativeBuildInputs = [ pkgconfig file perl cmake curl ]; nativeBuildInputs = [ pkgconfig file perl cmake curl ];
buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
postInstall = '' postInstall = ''
install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"

11
pkgs/top-level/all-packages.nix
View File

@ -3690,11 +3690,11 @@ with pkgs;
nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
openssl = openssl_1_1_0; openssl = openssl_1_1;
}; };
nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
enableNpm = false; enableNpm = false;
openssl = openssl_1_1_0; openssl = openssl_1_1;
}; };
nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix { nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix {
@ -3730,7 +3730,7 @@ with pkgs;
ldapvi = callPackage ../tools/misc/ldapvi { }; ldapvi = callPackage ../tools/misc/ldapvi { };
ldns = callPackage ../development/libraries/ldns { ldns = callPackage ../development/libraries/ldns {
openssl = openssl_1_1_0; openssl = openssl_1_1;
}; };
leafpad = callPackage ../applications/editors/leafpad { }; leafpad = callPackage ../applications/editors/leafpad { };
@ -5576,7 +5576,7 @@ with pkgs;
tokei = callPackage ../development/tools/misc/tokei { }; tokei = callPackage ../development/tools/misc/tokei { };
tor = callPackage ../tools/security/tor { tor = callPackage ../tools/security/tor {
openssl = openssl_1_1_0; openssl = openssl_1_1;
# remove this, when libevent's openssl is upgraded to 1_1_0 or newer. # remove this, when libevent's openssl is upgraded to 1_1_0 or newer.
libevent = libevent.override { libevent = libevent.override {
sslSupport = false; sslSupport = false;
@ -11452,7 +11452,7 @@ with pkgs;
}; };
}) })
openssl_1_0_2 openssl_1_0_2
openssl_1_1_0; openssl_1_1;
openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix {
cryptodevHeaders = linuxPackages.cryptodev.override { cryptodevHeaders = linuxPackages.cryptodev.override {
@ -15162,6 +15162,7 @@ with pkgs;
powerline-rs = callPackage ../tools/misc/powerline-rs { powerline-rs = callPackage ../tools/misc/powerline-rs {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
}; };
profont = callPackage ../data/fonts/profont { }; profont = callPackage ../data/fonts/profont { };