cgal_4: drop
cgal_4 has no consumers in nixpkgs, last update was 2020-02-25 and has since been replaced by cgal 5. remove it from nixpkgs
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
doxygen,
|
||||
graphviz,
|
||||
boost,
|
||||
cgal_5,
|
||||
cgal,
|
||||
gdal,
|
||||
glew,
|
||||
gmp,
|
||||
@@ -32,7 +32,7 @@ let
|
||||
enablePython = true;
|
||||
inherit python;
|
||||
};
|
||||
cgal = cgal_5.override {
|
||||
cgal' = cgal.override {
|
||||
boost = boost';
|
||||
};
|
||||
in
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
boost'
|
||||
cgal
|
||||
cgal'
|
||||
gdal
|
||||
glew
|
||||
gmp
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
bison,
|
||||
boost,
|
||||
cairo,
|
||||
cgal_5,
|
||||
cgal,
|
||||
clipper2,
|
||||
double-conversion,
|
||||
eigen,
|
||||
@@ -83,7 +83,7 @@ clangStdenv.mkDerivation rec {
|
||||
mimalloc
|
||||
boost
|
||||
cairo
|
||||
cgal_5
|
||||
cgal
|
||||
double-conversion
|
||||
eigen
|
||||
fontconfig
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
boost,
|
||||
gmp,
|
||||
mpfr,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.14.3";
|
||||
pname = "cgal";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${version}/CGAL-${version}.tar.xz";
|
||||
hash = "sha256-W6/nq+hDW+yhehCCBi02M2jsHj8NZYG7DaiwEPs4n+Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./cgal_path.patch
|
||||
|
||||
# Pull upstream fix for c++17 (gcc-12):
|
||||
# https://github.com/CGAL/cgal/pull/6109
|
||||
(fetchpatch {
|
||||
name = "gcc-12-prereq.patch";
|
||||
url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch";
|
||||
relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
|
||||
sha256 = "sha256-4+7mzGSBwAv5RHBQPAecPPKNN/LQBgvYq5mq+fHAteo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "gcc-12.patch";
|
||||
url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch";
|
||||
relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
|
||||
sha256 = "sha256-8kxJDT47jXI9kQNFI/ARWl9JBNS4AfU57/D0tYlgW0M=";
|
||||
})
|
||||
];
|
||||
|
||||
# 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 ];
|
||||
|
||||
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 ];
|
||||
};
|
||||
}
|
||||
@@ -201,6 +201,8 @@ mapAliases {
|
||||
cargo-espflash = espflash;
|
||||
cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
|
||||
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
|
||||
|
||||
@@ -8768,10 +8768,7 @@ with pkgs;
|
||||
certbot-dns-route53
|
||||
]);
|
||||
|
||||
# CGAL 5 has API changes
|
||||
cgal_4 = callPackage ../development/libraries/CGAL/4.nix { };
|
||||
cgal_5 = callPackage ../development/libraries/CGAL { };
|
||||
cgal = cgal_5;
|
||||
cgal = callPackage ../development/libraries/CGAL { };
|
||||
|
||||
check = callPackage ../development/libraries/check {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
|
||||
Reference in New Issue
Block a user