cgal: 5.6.2 -> 6.0.1 continued (#435845)

maintainers/maintainer-list.nix

@@ -6826,6 +6826,12 @@
     githubId = 81854406;
     name = "Chew Cheng Hong";
   };
+  drew-dirac = {
+    email = "drew@diracinc.com";
+    github = "drew-dirac";
+    githubId = 187309685;
+    name = "Drew Council";
+  };
   drewrisinger = {
     email = "drisinger+nixpkgs@gmail.com";
     github = "drewrisinger";
@@ -28104,6 +28110,12 @@
     githubId = 1311192;
     name = "Alexander Kiselyov";
   };
+  ylannl = {
+    email = "ravi@ylan.nl";
+    github = "ylannl";
+    githubId = 1742643;
+    name = "Ravi Peters";
+  };
   ylecornec = {
     email = "yves.stan.lecornec@tweag.io";
     github = "ylecornec";

pkgs/applications/misc/prusa-slicer/default.nix

@@ -8,7 +8,7 @@
   wrapGAppsHook3,
   boost186,
   cereal,
-  cgal,
+  cgal_5,
   curl,
   dbus,
   eigen,
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     binutils
     boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799
     cereal
-    cgal
+    cgal_5
     curl
     dbus
     eigen

pkgs/by-name/cg/cgal/5.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  boost,
+  gmp,
+  mpfr,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cgal";
+  version = "5.6.2";
+
+  src = fetchurl {
+    url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz";
+    hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4=";
+  };
+
+  # note: optional component libCGAL_ImageIO would need zlib and opengl;
+  #   there are also libCGAL_Qt{3,4} omitted ATM
+  buildInputs = [
+    boost
+    gmp
+    mpfr
+  ];
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./cgal_path.patch ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Computational Geometry Algorithms Library";
+    homepage = "http://cgal.org";
+    license = with licenses; [
+      gpl3Plus
+      lgpl3Plus
+    ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.raskin ];
+  };
+}

pkgs/by-name/cg/cgal/package.nix

@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cgal";
-  version = "5.6.2";
+  version = "6.0.1";
 
   src = fetchurl {
     url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz";
-    hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4=";
+    sha256 = "0zwvyp096p0vx01jks9yf74nx6zjh0vjbwr6sl6n6mn52zrzpk8a";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
@@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
       lgpl3Plus
     ];
     platforms = platforms.all;
-    maintainers = [ maintainers.raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      drew-dirac
+      ylannl
+    ];
   };
 }

pkgs/by-name/ka/kagen/package.nix

@@ -6,7 +6,7 @@
   cmake,
   pkg-config,
   mpi,
-  cgal,
+  cgal_5,
   boost,
   gmp,
   mpfr,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     mpi
-    cgal
+    cgal_5
     sparsehash
     imagemagick
     # should be propagated by cgal

pkgs/by-name/op/openscad/package.nix

@@ -12,7 +12,7 @@
   libGL,
   glew,
   opencsg,
-  cgal,
+  cgal_5,
   mpfr,
   gmp,
   glib,
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     boost
     glew
     opencsg
-    cgal
+    cgal_5
     mpfr
     gmp
     glib

pkgs/by-name/or/orca-slicer/package.nix

@@ -9,7 +9,7 @@
   wrapGAppsHook3,
   boost186,
   cereal,
-  cgal,
+  cgal_5,
   curl,
   dbus,
   eigen,
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     })
     boost186.dev
     cereal
-    cgal
+    cgal_5
     curl
     dbus
     eigen

pkgs/development/python-modules/ifcopenshell/default.nix

@@ -16,7 +16,7 @@
   # native dependencies
   eigen,
   boost,
-  cgal,
+  cgal_5,
   gmp,
   hdf5,
   icu,
@@ -93,7 +93,7 @@ buildPythonPackage rec {
     # ifcopenshell needs stdc++
     (lib.getLib stdenv.cc.cc)
     boost
-    cgal
+    cgal_5
     eigen
     gmp
     hdf5

pkgs/top-level/aliases.nix

@@ -583,7 +583,7 @@ mapAliases {
   centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
   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
-  cgal_5 = cgal; # Added 2024-12-30
+
   challenger = taler-challenger; # Added 2024-09-04
   check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
   check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03

pkgs/top-level/all-packages.nix

@@ -320,6 +320,8 @@ with pkgs;
 
   cameractrls-gtk3 = cameractrls.override { withGtk = 3; };
 
+  cgal_5 = callPackage ../by-name/cg/cgal/5.nix { };
+
   checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix { };
 
   celeste-classic-pm = pkgs.celeste-classic.override {

pkgs/top-level/python-packages.nix

@@ -6909,7 +6909,7 @@ self: super: with self; {
   ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { };
 
   ifcopenshell = callPackage ../development/python-modules/ifcopenshell {
-    inherit (pkgs) cgal libxml2;
+    inherit (pkgs) cgal_5 libxml2;
   };
 
   igloohome-api = callPackage ../development/python-modules/igloohome-api { };