Unverified Commit 69c600fe authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

asio: 1.24.0 -> 1.36.0 (#414478)

parents 26813840 f5ea30e6
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@

- All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years.

- `asio` (standalone version of `boost::asio`) has been updated from 1.24.0 to 1.36.0. Some breaking changes were introduced between these
  two versions, and the one affected most was the removal of `asio::io_service` in favor of `asio::io_context` in 1.33.0. `asio_1_32_0` is
  retained for packages that have not completed migration. `asio_1_10` has been removed as no packages depend on it anymore.
  `asio` also no longer propagates `boost` as it is used independent from `boost` in most cases.

- `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3.

## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
+69 −0
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  autoreconfHook,
  pkg-config,
  openssl,
  boost,
  testers,
  asioVersion ? "1.36.0",
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "asio";
  version = asioVersion;

  src = fetchFromGitHub {
    owner = "chriskohlhoff";
    repo = "asio";
    tag = "asio-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
    hash =
      {
        # Preserve 1.32.0 because some project depends on asio/io_service.hpp
        "1.32.0" = "sha256-PBoa4OAOOmHas9wCutjz80rWXc3zGONntb9vTQk3FNY=";
        "1.36.0" = "sha256-BhJpE5+t0WXsuQ5CtncU0P8Kf483uFoV+OGlFLc7TpQ=";
      }
      .${asioVersion} or (throw "Unsupported asio version. Please use overrideAttrs directly");
  };

  sourceRoot = "${finalAttrs.src.name}/asio";

  nativeBuildInputs = [
    autoreconfHook
    pkg-config
  ];

  # Only used for test coverage
  checkInputs = [
    openssl
    boost
  ];

  configureFlags = lib.optionals finalAttrs.finalPackage.doCheck [
    # Only used in tests, "HAVE_BOOST_COROUTINE"
    "--enable-boost-coroutine"

    # There is also the "--with-boost" flag, but
    # after several tests, it doesn't make any difference
    # in the output.
  ];

  enableParallelBuilding = true;

  doCheck = true;

  passthru.tests.pkg-config = testers.hasPkgConfigModules {
    package = finalAttrs.finalPackage;
    versionCheck = true;
  };

  meta = {
    homepage = "https://think-async.com/Asio";
    description = "Cross-platform C++ library for network and low-level I/O programming";
    license = lib.licenses.boost;
    maintainers = with lib.maintainers; [ aleksana ];
    platforms = lib.platforms.unix;
    pkgConfigModules = [ "asio" ];
  };
})
+17 −3
Original line number Diff line number Diff line
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dbc2c3..cfdd98d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ project(Crow
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake)
 
 # Make sure Findasio.cmake module is found
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 67c458c..2873530 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,18 +5,9 @@
@@ -5,18 +5,9 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 new)
 set(CMAKE_POLICY_WARNING_CMP0126 new)
 
 include(${CMAKE_SOURCE_DIR}/cmake/compiler_options.cmake)
@@ -9,7 +23,7 @@
+find_package(Catch2 REQUIRED)
 
-CPMAddPackage(Catch2
-  VERSION 3.7.0
-  VERSION 3.10.0
-  GITHUB_REPOSITORY catchorg/Catch2
-  OPTIONS
-  "CATCH_INSTALL_DOCS Off"
@@ -19,4 +33,4 @@
-  
 enable_testing()
 
 set(TEST_SRCS
 # list the test sources
+4 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "crow";
  version = "1.2.1.2";
  version = "1.3.0.0";

  src = fetchFromGitHub {
    owner = "CrowCpp";
    repo = "Crow";
    tag = "v${finalAttrs.version}";
    hash = "sha256-iQ2owNry4LOmMxyO5L7O7XZB5vwUf+ZuZL76hZ6FThk=";
    hash = "sha256-QLYQ0RouqDDvhnBF79O/9M7IwlF0eQ3HTqR6bXWm574=";
  };

  patches = [
@@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {

  cmakeFlags = [
    (lib.cmakeBool "CROW_BUILD_EXAMPLES" false)
    # Requires more non-trivial patches to get around CPM
    (lib.cmakeBool "CROW_GENERATE_SBOM" false)
  ];

  doCheck = true;
+0 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@
  speexdsp,
  hamlib_4,
  wxGTK32,
  sioclient,
  dbus,
  apple-sdk_15,
  nix-update-script,
@@ -133,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: {
    speexdsp
    hamlib_4
    wxGTK32
    sioclient
    python3.pkgs.numpy
  ]
  ++ (
Loading