From 242e52dbb10db220aaa1d157720914864bbf685f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 30 Jul 2019 03:41:32 +0200 Subject: [PATCH] treewide: remove openssl 1.1 pinning --- pkgs/applications/altcoins/default.nix | 3 +-- .../altcoins/wasabiwallet/default.nix | 4 +-- .../networking/nextcloud-client/default.nix | 10 +++---- pkgs/tools/networking/dsniff/default.nix | 6 ++--- .../tools/package-management/xbps/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 27 ++++--------------- 6 files changed, 18 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 5293c1eefa36..5d89bd96ed91 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -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 { @@ -90,7 +90,6 @@ rec { zcash = callPackage ./zcash { withGui = false; - openssl = openssl_1_1; }; parity = callPackage ./parity { }; diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/altcoins/wasabiwallet/default.nix index 9eef471adad2..7185b3510601 100644 --- a/pkgs/applications/altcoins/wasabiwallet/default.nix +++ b/pkgs/applications/altcoins/wasabiwallet/default.nix @@ -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 { pname = "wasabiwallet"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cd $out/opt/${pname} for i in $(find . -type f -name '*.so') wassabee 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 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee ln -s $out/opt/${pname}/wassabee $out/bin/${pname} diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 37eb248fb486..b9015e7a9e3a 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { 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 }: @@ -16,17 +16,17 @@ stdenv.mkDerivation rec { 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; - 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 = [ "-UCMAKE_INSTALL_LIBDIR" "-DCMAKE_BUILD_TYPE=Release" - "-DOPENSSL_LIBRARIES=${openssl_1_1.out}/lib" - "-DOPENSSL_INCLUDE_DIR=${openssl_1_1.dev}/include" + "-DOPENSSL_LIBRARIES=${openssl.out}/lib" + "-DOPENSSL_INCLUDE_DIR=${openssl.dev}/include" "-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so" "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 50a3c98af0f7..9ddc1a35ce37 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -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 /* dsniff's build system unconditionnaly wants static libraries and does not @@ -33,8 +33,8 @@ let dontDisableStatic = true; }); ssl = symlinkJoin { - inherit (openssl_1_1) name; - paths = with openssl_1_1.override { static = true; }; [ out dev ]; + inherit (openssl) name; + paths = with openssl.override { static = true; }; [ out dev ]; }; in stdenv.mkDerivation { pname = "dsniff"; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 6a96e5b43b50..5954ca4959b6 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl_1_1, libarchive }: +{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ zlib openssl_1_1 libarchive ]; + buildInputs = [ zlib openssl libarchive ]; patches = [ ./cert-paths.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed730560eb07..716a91f1091f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4326,26 +4326,17 @@ in nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - openssl = openssl_1_1; - }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { 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 { 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 { enableNpm = false; - openssl = openssl_1_1; }; # Update this when adding the newest nodejs major version! @@ -4390,9 +4381,7 @@ in ldapvi = callPackage ../tools/misc/ldapvi { }; - ldns = callPackage ../development/libraries/ldns { - openssl = openssl_1_1; - }; + ldns = callPackage ../development/libraries/ldns { }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -6423,7 +6412,6 @@ in toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; tor = callPackage ../tools/security/tor { - openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. libevent = libevent.override { sslSupport = false; @@ -11633,9 +11621,7 @@ in libgadu = callPackage ../development/libraries/libgadu { }; - libgda = callPackage ../development/libraries/libgda { - openssl = openssl_1_1; - }; + libgda = callPackage ../development/libraries/libgda { }; libgdamm = callPackage ../development/libraries/libgdamm { }; @@ -14600,14 +14586,12 @@ in # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; - openssl = openssl_1_1; }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; - openssl = openssl_1_1; }; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; @@ -16803,7 +16787,6 @@ in powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; profont = callPackage ../data/fonts/profont { };