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

treewide: remove openssl 1.1 pinning

Browse Source
This commit is contained in:
Robin Gloster 2019-07-30 03:41:32 +02:00
parent fafcf50a56
commit 242e52dbb1
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
6 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeDesktopItem, openssl_1_1, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }: { stdenv, fetchurl, makeDesktopItem, openssl, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wasabiwallet"; pname = "wasabiwallet";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
cd $out/opt/${pname} cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee for i in $(find . -type f -name '*.so') wassabee
do do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl_1_1 stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
done done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname} ln -s $out/opt/${pname}/wassabee $out/bin/${pname}

10
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
, inotify-tools, wrapQtAppsHook, openssl_1_1, pcre, qtwebengine, libsecret , inotify-tools, wrapQtAppsHook, openssl, pcre, qtwebengine, libsecret
, libcloudproviders , libcloudproviders
}: }:
@ -16,17 +16,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl.out pcre inotify-tools libcloudproviders ];
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_LDFLAGS = "${openssl_1_1.out}/lib/libssl.so ${openssl_1_1.out}/lib/libcrypto.so"; NIX_LDFLAGS = "${openssl.out}/lib/libssl.so ${openssl.out}/lib/libcrypto.so";
cmakeFlags = [ cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR" "-UCMAKE_INSTALL_LIBDIR"
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
"-DOPENSSL_LIBRARIES=${openssl_1_1.out}/lib" "-DOPENSSL_LIBRARIES=${openssl.out}/lib"
"-DOPENSSL_INCLUDE_DIR=${openssl_1_1.dev}/include" "-DOPENSSL_INCLUDE_DIR=${openssl.dev}/include"
"-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so" "-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so"
"-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include"
]; ];

6
pkgs/tools/networking/dsniff/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl_1_1 }: { stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl }:
let let
/* /*
dsniff's build system unconditionnaly wants static libraries and does not dsniff's build system unconditionnaly wants static libraries and does not
@ -33,8 +33,8 @@ let
dontDisableStatic = true; dontDisableStatic = true;
}); });
ssl = symlinkJoin { ssl = symlinkJoin {
inherit (openssl_1_1) name; inherit (openssl) name;
paths = with openssl_1_1.override { static = true; }; [ out dev ]; paths = with openssl.override { static = true; }; [ out dev ];
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "dsniff"; pname = "dsniff";

4
pkgs/tools/package-management/xbps/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl_1_1, libarchive }: { stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xbps"; pname = "xbps";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig which ]; nativeBuildInputs = [ pkgconfig which ];
buildInputs = [ zlib openssl_1_1 libarchive ]; buildInputs = [ zlib openssl libarchive ];
patches = [ ./cert-paths.patch ]; patches = [ ./cert-paths.patch ];

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

@ -4326,26 +4326,17 @@ in
nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
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;
};
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;
};
nodejs-11_x = callPackage ../development/web/nodejs/v11.nix {
openssl = openssl_1_1;
}; };
nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { };
nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix {
enableNpm = false; enableNpm = false;
openssl = openssl_1_1;
};
nodejs-12_x = callPackage ../development/web/nodejs/v12.nix {
openssl = openssl_1_1;
}; };
nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { };
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
enableNpm = false; enableNpm = false;
openssl = openssl_1_1;
}; };
# Update this when adding the newest nodejs major version! # Update this when adding the newest nodejs major version!
@ -4390,9 +4381,7 @@ in
ldapvi = callPackage ../tools/misc/ldapvi { }; ldapvi = callPackage ../tools/misc/ldapvi { };
ldns = callPackage ../development/libraries/ldns { ldns = callPackage ../development/libraries/ldns { };
openssl = openssl_1_1;
};
leafpad = callPackage ../applications/editors/leafpad { }; leafpad = callPackage ../applications/editors/leafpad { };
@ -6423,7 +6412,6 @@ in
toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { };
tor = callPackage ../tools/security/tor { tor = callPackage ../tools/security/tor {
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;
@ -11633,9 +11621,7 @@ in
libgadu = callPackage ../development/libraries/libgadu { }; libgadu = callPackage ../development/libraries/libgadu { };
libgda = callPackage ../development/libraries/libgda { libgda = callPackage ../development/libraries/libgda { };
openssl = openssl_1_1;
};
libgdamm = callPackage ../development/libraries/libgdamm { }; libgdamm = callPackage ../development/libraries/libgdamm { };
@ -14600,14 +14586,12 @@ in
# We don't use `with` statement here on purpose! # We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
openssl = openssl_1_1;
}; };
nginxMainline = callPackage ../servers/http/nginx/mainline.nix { nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
# We don't use `with` statement here on purpose! # We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.dav nginxModules.moreheaders ]; modules = [ nginxModules.dav nginxModules.moreheaders ];
openssl = openssl_1_1;
}; };
nginxModules = callPackage ../servers/http/nginx/modules.nix { }; nginxModules = callPackage ../servers/http/nginx/modules.nix { };
@ -16803,7 +16787,6 @@ in
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 { };