diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch b/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch new file mode 100644 index 0000000000000..ce719360cce55 --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch @@ -0,0 +1,80 @@ +From cbb17366904c97bb5db40644c277be41219261da Mon Sep 17 00:00:00 2001 +From: Emily +Date: Tue, 9 Sep 2025 20:42:11 +0100 +Subject: [PATCH] =?UTF-8?q?Fix=20the=20build=20with=20cereal=20=E2=89=A5?= + =?UTF-8?q?=201.3.1?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Based on . + +Co-authored-by: Yuri D'Elia +Co-authored-by: tamasmeszaros +--- + CMakeLists.txt | 6 ++++++ + src/CMakeLists.txt | 3 +-- + src/libslic3r/CMakeLists.txt | 2 +- + src/slic3r/CMakeLists.txt | 2 +- + 4 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a112949bba..81b0a4244f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -469,6 +469,12 @@ endif () + + # Find the Cereal serialization library + find_package(cereal REQUIRED) ++add_library(libcereal INTERFACE) ++if (NOT TARGET cereal::cereal) ++ target_link_libraries(libcereal INTERFACE cereal) ++else() ++ target_link_libraries(libcereal INTERFACE cereal::cereal) ++endif() + + # l10n + set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index bf721a7635..71a62a9024 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -144,8 +144,7 @@ if (NOT WIN32) + set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}") + endif () + +-target_link_libraries(Slic3r libslic3r cereal) +- ++target_link_libraries(Slic3r libslic3r libcereal) + if (APPLE) + # add_compile_options(-stdlib=libc++) + # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) +diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt +index 84be9c12e5..4940549134 100644 +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -420,7 +420,7 @@ find_package(JPEG REQUIRED) + target_link_libraries(libslic3r + libnest2d + admesh +- cereal ++ libcereal + libigl + miniz + boost_libs +diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt +index c11f860c59..c1eb966de1 100644 +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$:SLIC3 + + encoding_check(libslic3r_gui) + +-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES}) + + if (MSVC) + target_link_libraries(libslic3r_gui Setupapi.lib) +-- +2.50.1 + diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 4eb3acc4e5fee..92cadda3e57f6 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -20,6 +20,7 @@ let hash = "sha256-fh31qrqjQiRQL03pQl4KJAEtbKMwG8/nJroqIDOIePw="; }) ./super-slicer-use-boost186.patch + ./super-slicer-fix-cereal-1.3.1.patch ]; wxGTK31-prusa = wxGTK31.overrideAttrs (old: { diff --git a/pkgs/by-name/ce/cereal_1_3_2/package.nix b/pkgs/by-name/ce/cereal/package.nix similarity index 100% rename from pkgs/by-name/ce/cereal_1_3_2/package.nix rename to pkgs/by-name/ce/cereal/package.nix diff --git a/pkgs/by-name/ce/cereal_1_3_0/package.nix b/pkgs/by-name/ce/cereal_1_3_0/package.nix deleted file mode 100644 index d1fb82a6267db..0000000000000 --- a/pkgs/by-name/ce/cereal_1_3_0/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cereal"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "USCiLab"; - repo = "cereal"; - rev = "v${finalAttrs.version}"; - hash = "sha256-NwyUVeqXxfdyuDevjum6r8LyNtHa0eJ+4IFd3hLkiEE="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2020-11105.patch"; - url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; - hash = "sha256-CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; - - meta = { - homepage = "https://uscilab.github.io/cereal/"; - description = "Header-only C++11 serialization library"; - changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 5a0ee6c7f2cb2..96dcf60e4df3c 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -7,7 +7,7 @@ glfw, glm, spdlog, - cereal_1_3_2, + cereal, python3Packages, }: @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { # non-numerical spdlog - cereal_1_3_2 + cereal glfw ]; diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 31b95407709a4..d1e5dca8dfce1 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -13,7 +13,7 @@ graphviz, # propagatedBuildInputs - cereal_1_3_2, + cereal, eigen, jrl-cmakemodules, simde, @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - cereal_1_3_2 + cereal eigen jrl-cmakemodules simde diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix index dd728d3d1e102..ad1ed4fd56203 100644 --- a/pkgs/by-name/sa/salmon/package.nix +++ b/pkgs/by-name/sa/salmon/package.nix @@ -3,7 +3,7 @@ stdenv, boost, bzip2, - cereal_1_3_2, + cereal, cmake, curl, fetchFromGitHub, @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { enabledStatic = true; }) bzip2 - cereal_1_3_2 + cereal curl icu jemalloc diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4ae01b6d80a27..a2d72fa8d76b6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -595,6 +595,8 @@ mapAliases { cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenace"; # Added 2025-08-25 cde = throw "'cde' has been removed as it is unmaintained and broken"; # Added 2025-05-17 centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18 + cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12 + cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12 certmgr-selfsigned = certmgr; # Added 2023-11-30 cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87a2d32ffdd8f..e33049540d803 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -283,7 +283,6 @@ with pkgs; cve = with python3Packages; toPythonApplication cvelib; basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix { - cereal = cereal_1_3_2; opencv = opencv.override { enableGtk3 = true; }; }; @@ -327,8 +326,6 @@ with pkgs; practiceMod = true; }; - cereal = cereal_1_3_0; - chef-cli = callPackage ../tools/misc/chef-cli { }; clang-uml = callPackage ../by-name/cl/clang-uml/package.nix {