cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #255928 from bcdarwin/remove-vtk_8

Browse source 
vtk_8: remove
This commit is contained in:
Dmitry Kalinkin 2023-09-23 15:50:41 -04:00 committed by GitHub
commit 9e7786c32b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 68 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/science/physics/elmerfem/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, tbb, vtkWithQt5 }:
{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade-occt, libsForQt5, tbb, vtkWithQt5 }:
stdenv.mkDerivation rec {
pname = "elmerfem";
version = "unstable-2023-02-03";
version = "unstable-2023-09-18";
src = fetchFromGitHub {
owner = "elmercsc";
repo = pname;
rev = "39c8784b6e4543a6bf560b5d597e0eec1eb06343";
hash = "sha256-yyxgFvlS+I4PouDL6eD4ZrXuONTDejCSYKq2AwQ0Iug=";
rev = "0fcced06f91c93f44557efd6a5f10b2da5c7066c";
hash = "sha256-UuARDYW7D3a4dB6I86s2Ed5ecQxc+Y/es3YIeF2VyTc=";
};
hardeningDisable = [ "format" ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
libsForQt5.qwt
libGL
libGLU
opencascade
opencascade-occt
tbb
vtkWithQt5
];

65
pkgs/development/libraries/opencascade/default.nix
View file

@ -1,65 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb,
OpenCL, Cocoa
}:
stdenv.mkDerivation rec {
pname = "opencascade-oce";
version = "0.18.3";
src = fetchFromGitHub {
owner = "tpaviot";
repo = "oce";
rev = "OCE-${version}";
sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig";
};
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [
libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8
gl2ps tbb
]
++ lib.optionals stdenv.isDarwin [OpenCL Cocoa]
;
cmakeFlags = [
"-DOCE_INSTALL_PREFIX=${placeholder "out"}"
"-DOCE_WITH_FREEIMAGE=ON"
"-DOCE_WITH_VTK=ON"
"-DOCE_WITH_GL2PS=ON"
"-DOCE_MULTITHREAD_LIBRARY=TBB"
]
++ lib.optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"];
patches = [
# Use fontconfig instead of hardcoded directory list
# https://github.com/tpaviot/oce/pull/714
(fetchpatch {
url = "https://github.com/tpaviot/oce/commit/9643432b27fec8974ca0ee15c3c372f5fe8fc069.patch";
sha256 = "1wd940rszmh5apcpk5fv6126h8mcjcy4rjifrql5d4ac90v06v4c";
})
# Fix for glibc 2.26
(fetchpatch {
url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch";
sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k";
})
(fetchpatch {
url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch";
sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc";
})
];
postPatch = ''
# make sure the installed cmake file uses absolute paths for fontconfig
substituteInPlace adm/cmake/TKService/CMakeLists.txt \
--replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES
'';
meta = with lib; {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = "https://github.com/tpaviot/oce";
maintainers = [ maintainers.viric ];
platforms = platforms.unix;
license = licenses.lgpl21;
};
}

2
pkgs/development/libraries/opencv/3.x.nix
View file

@ -22,7 +22,6 @@
, enablePython ? false, pythonPackages ? null
, enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3
, enableVtk ? false, vtk_8
, enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1
, enableTesseract ? false, tesseract, leptonica
@ -191,7 +190,6 @@ stdenv.mkDerivation {
++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
++ lib.optional enableVtk vtk_8
++ lib.optional enableJPEG libjpeg
++ lib.optional enablePNG libpng
++ lib.optional enableTIFF libtiff

16
pkgs/development/libraries/openscenegraph/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, doxygen,
libX11, libXinerama, libXrandr, libGLU, libGL,
glib, ilmbase, libxml2, pcre, zlib,
AGL, Accelerate, Carbon, Cocoa, Foundation,
@ -11,7 +11,7 @@
gdalSupport ? false, gdal,
curlSupport ? true, curl,
colladaSupport ? false, collada-dom,
opencascadeSupport ? false, opencascade,
opencascadeSupport ? false, opencascade-occt,
ffmpegSupport ? false, ffmpeg,
nvttSupport ? false, nvidia-texture-tools,
freetypeSupport ? true, freetype,
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
++ lib.optional gdalSupport gdal
++ lib.optional curlSupport curl
++ lib.optional colladaSupport collada-dom
++ lib.optional opencascadeSupport opencascade
++ lib.optional opencascadeSupport opencascade-occt
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional nvttSupport nvidia-texture-tools
++ lib.optional freetypeSupport freetype
@ -66,7 +66,15 @@ stdenv.mkDerivation rec {
++ lib.optionals (!stdenv.isDarwin) [ ]
++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ]
++ lib.optional (restSupport || colladaSupport) boost
;
;
patches = [
(fetchpatch {
name = "opencascade-api-patch";
url = "https://github.com/openscenegraph/OpenSceneGraph/commit/bc2daf9b3239c42d7e51ecd7947d31a92a7dc82b.patch";
hash = "sha256-VR8YKOV/YihB5eEGZOGaIfJNrig1EPS/PJmpKsK284c=";
})
];
cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";

52
pkgs/development/libraries/science/biology/mirtk/default.nix
View file

@ -1,14 +1,27 @@
{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk_8, zlib, tbb }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, python3
, boost
, eigen
, libGLU
, fltk
, itk
, vtk
, zlib
, tbb
}:
stdenv.mkDerivation rec {
version = "2.0.0";
pname = "mirtk";
version = "unstable-2022-07-22";
src = fetchFromGitHub {
owner = "BioMedIA";
repo = "MIRTK";
rev = "v${version}";
sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk";
rev = "973ce2fe3f9508dec68892dbf97cca39067aa3d6";
hash = "sha256-vKgkDrbyGOcbaYlxys1duC8ZNG0Y2nqh3TtSQ06Ox0Q=";
fetchSubmodules = true;
};
@ -16,23 +29,36 @@ stdenv.mkDerivation rec {
"-DWITH_VTK=ON"
"-DBUILD_ALL_MODULES=ON"
"-DWITH_TBB=ON"
"-DWITH_ITK=ON"
"-DWITH_GIFTICLIB=ON"
"-DWITH_NIFTILIB=ON"
];
doCheck = true;
checkPhase = ''
ctest -E '(Polynomial|ConvolutionFunction|Downsampling|EdgeTable|InterpolateExtrapolateImage)'
# tries to download data during configuration
postPatch = ''
substituteInPlace Packages/DrawEM/CMakeLists.txt --replace "include(Atlases.cmake)" ""
'';
# testPolynomial - segfaults for some reason
# testConvolutionFunction, testDownsampling - main not called correctly
# testEdgeTable, testInterpolateExtrapolateImageFunction - setup fails
# tests don't seem to be maintained and gtest fails to link with BUILD_TESTING=ON;
# unclear if specific to Nixpkgs
doCheck = false;
postInstall = ''
install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk
'';
nativeBuildInputs = [ cmake gtest ];
buildInputs = [ boost eigen python3 vtk_8 zlib tbb ];
nativeBuildInputs = [ cmake ];
buildInputs = [
boost
eigen
fltk
itk
libGLU.dev
python3
tbb
vtk
zlib
];
meta = with lib; {
homepage = "https://github.com/BioMedIA/MIRTK";

35
pkgs/development/libraries/smesh/default.nix
View file

@ -1,35 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade
, Cocoa }:
stdenv.mkDerivation rec {
pname = "smesh";
version = "6.7.6";
src = fetchFromGitHub {
owner = "tpaviot";
repo = "smesh";
rev = version;
sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0";
};
patches = [
(fetchpatch {
name = "fix-build-with-clang.patch";
url = "https://github.com/tpaviot/smesh/commit/e32c430f526f1637ec5973c9723acbc5be571ae3.patch";
sha256 = "0s4j5rb70g3jvvkgfbrxv7q52wk6yjyjiaya61gy2j64khplcjlb";
})
];
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ];
meta = with lib; {
description = "Extension to OCE providing advanced meshing features";
homepage = "https://github.com/tpaviot/smesh";
license = licenses.lgpl21;
platforms = platforms.unix;
maintainers = with maintainers; [ gebner ];
};
}

18
pkgs/development/libraries/vtk/8.x.nix
View file

@ -1,18 +0,0 @@
import ./generic.nix {
majorVersion = "8.2";
minorVersion = "0";
sourceSha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl";
patchesToFetch = [{
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff";
sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy";
}
{
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f";
sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5";
}
{
url = "https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6943.diff";
sha256 = "sha256:1nzdw3f6bsri04y528zj2klqkb9p8s4lnl9g5zvm119m1cmyhn04";
}
];
}

12
pkgs/development/python-modules/cadquery/default.nix
View file

@ -5,12 +5,11 @@
, pythonAtLeast
, fetchFromGitHub
, pyparsing
, opencascade
, opencascade-occt
, stdenv
, python
, cmake
, swig
, smesh
, freetype
, libGL
, libGLU
@ -42,8 +41,7 @@ let
buildInputs = [
python
opencascade
smesh
opencascade-occt
freetype
libGL
libGLU
@ -57,9 +55,6 @@ let
cmakeFlags = [
"-Wno-dev"
"-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC"
"-DSMESH_INCLUDE_PATH=${smesh}/include/smesh"
"-DSMESH_LIB_PATH=${smesh}/lib"
"-DPYTHONOCC_WRAP_SMESH=TRUE"
];
});
@ -76,7 +71,7 @@ in
};
buildInputs = [
opencascade
opencascade-occt
];
propagatedBuildInputs = [
@ -99,5 +94,6 @@ in
homepage = "https://github.com/CadQuery/cadquery";
license = licenses.asl20;
maintainers = with maintainers; [ marcus7070 ];
broken = true;
};
}

13
pkgs/development/python-modules/pythonocc-core/default.nix
View file

@ -1,4 +1,7 @@
{ lib, stdenv, python, fetchFromGitHub
{ lib
, stdenv
, python
, fetchFromGitHub
, cmake
, Cocoa
, fontconfig
@ -11,7 +14,6 @@
, libXmu
, opencascade-occt
, rapidjson
, smesh
, swig4
}:
@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake swig4 ];
buildInputs = [
python opencascade-occt smesh
python opencascade-occt
freetype libGL libGLU libX11 libXext libXmu libXi
fontconfig rapidjson
] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
@ -42,10 +44,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-Wno-dev"
"-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC"
"-DSMESH_INCLUDE_PATH=${smesh}/include/smesh"
"-DSMESH_LIB_PATH=${smesh}/lib"
"-DPYTHONOCC_WRAP_SMESH=TRUE"
];
passthru = {
@ -57,6 +55,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Python wrapper for the OpenCASCADE 3D modeling kernel";
homepage = "https://github.com/tpaviot/pythonocc-core";
changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${version}";
license = licenses.lgpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ gebner ];

2
pkgs/top-level/aliases.nix
View file

@ -1266,6 +1266,7 @@ mapAliases ({
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22
opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18
opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22
openconnect_head = openconnect_unstable; # Added 2022-03-29
openconnect_gnutls = openconnect; # Added 2022-03-29
@ -1654,6 +1655,7 @@ mapAliases ({
slurm-llnl = slurm; # renamed July 2017
slurm-llnl-full = slurm-full; # renamed July 2017
smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22
smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18
smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04
snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21
soldat-unstable = opensoldat; # Added 2022-07-02

18
pkgs/top-level/all-packages.nix
View file

@ -13260,10 +13260,6 @@ with pkgs;
smenu = callPackage ../tools/misc/smenu { };
smesh = callPackage ../development/libraries/smesh {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
boost-sml = callPackage ../development/libraries/boost-ext/boost-sml { };
smu = callPackage ../tools/text/smu { };
@ -24468,9 +24464,6 @@ with pkgs;
python = python3;
};
opencascade = callPackage ../development/libraries/opencascade {
inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa;
};
opencascade-occt = callPackage ../development/libraries/opencascade-occt { };
opencl-headers = callPackage ../development/libraries/opencl-headers { };
@ -25665,17 +25658,6 @@ with pkgs;
gtkVersion = "4";
};
vtk_8 = libsForQt5.callPackage ../development/libraries/vtk/8.x.nix {
stdenv = gcc9Stdenv;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT;
};
vtk_8_withQt5 = vtk_8.override { enableQt = true; };
vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;