Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 36f084b2bbcb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c962821f2c1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 12, 2020

  1. 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.
    @bhipple
    bhipple committed Jan 12, 2020
    Copy the full SHA
    3a22c75 View commit details

Commits on Jan 13, 2020

  1. Merge pull request #77568 from bhipple/fix/cpp-netlib-openssl 

    cpp-netlib: remove insecure openssl dependency and unnecessary asio
    @Mic92
    Mic92 authored Jan 13, 2020
    Copy the full SHA
    2c96282 View commit details
Showing with 12 additions and 9 deletions.
  1. +10 −6 pkgs/development/libraries/cpp-netlib/default.nix
  2. +2 −3 pkgs/top-level/all-packages.nix
16 changes: 10 additions & 6 deletions pkgs/development/libraries/cpp-netlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
5 changes: 2 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };