summary refs log tree commit diff
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2020-01-12 11:44:22 -0500
committerBenjamin Hipple <bhipple@protonmail.com>2020-01-12 11:59:07 -0500
commit3a22c758094fe415c3b8a3e79a88f16dc67799d5 (patch)
treebdd7425b071ff8b311ff56f19bd150a345058056
parent23bdc67f8bf820e8e492316d8af15df8f3b7bf81 (diff)
downloadnixpkgs-3a22c758094fe415c3b8a3e79a88f16dc67799d5.tar
nixpkgs-3a22c758094fe415c3b8a3e79a88f16dc67799d5.tar.gz
nixpkgs-3a22c758094fe415c3b8a3e79a88f16dc67799d5.tar.bz2
nixpkgs-3a22c758094fe415c3b8a3e79a88f16dc67799d5.tar.lz
nixpkgs-3a22c758094fe415c3b8a3e79a88f16dc67799d5.tar.xz
nixpkgs-3a22c758094fe415c3b8a3e79a88f16dc67799d5.tar.zst
nixpkgs-3a22c758094fe415c3b8a3e79a88f16dc67799d5.zip
cpp-netlib: remove insecure openssl dependency and unnecessary asio
Upstream openssl has dropped support for 1.0.2; see #77503 for details. This
also cleans up the old `asio` dependency, which now comes from `boost`, and
documents why the test driver fails.
-rw-r--r--pkgs/development/libraries/cpp-netlib/default.nix16
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index a4729cdeaed..31c4c70dd9d 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, openssl, asio }:
+{ stdenv, fetchFromGitHub, cmake, boost, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "cpp-netlib";
@@ -14,18 +14,22 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake boost openssl ];
 
-  # This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629
-  propagatedBuildInputs = [ asio ];
-
   cmakeFlags = [
     "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
   ];
 
   enableParallelBuilding = true;
 
+  # The test driver binary lacks an RPath to the library's libs
+  preCheck = ''
+    export LD_LIBRARY_PATH=$PWD/libs/network/src
+  '';
+
+  # Most tests make network GET requests to various websites
+  doCheck = false;
+
   meta = with stdenv.lib; {
-    description =
-      "Collection of open-source libraries for high level network programming";
+    description = "Collection of open-source libraries for high level network programming";
     homepage    = https://cpp-netlib.org;
     license     = licenses.boost;
     platforms   = platforms.all;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 982721ae44d..b4e9cf14477 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11065,9 +11065,8 @@ in
 
   cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };
 
-  cpp-netlib = callPackage ../development/libraries/cpp-netlib {
-    openssl = openssl_1_0_2;
-  };
+  cpp-netlib = callPackage ../development/libraries/cpp-netlib {};
+
   uri = callPackage ../development/libraries/uri { };
 
   cppcms = callPackage ../development/libraries/cppcms { };