From 38a5ede5c38f60a81dab77ac43c7fd45daf03f66 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 12:22:06 -0400 Subject: [PATCH 1/9] opencv3: remove enableVtk flag This flag does not actually cause opencv3 to detect vtk. Instead of fixing it, we remove it to remove the optional dependence on vtk_8. (Note this flag works correctly in opencv4.) --- pkgs/development/libraries/opencv/3.x.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d295efe6feed..8774c97de3b9 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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 From 0db4dea3b9e0cd5c48073986a057f05e58b8745a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 6 Sep 2023 13:40:16 -0400 Subject: [PATCH 2/9] mirtk: 2.0.0 -> unstable-2022-07-22 --- .../science/biology/mirtk/default.nix | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index de419dc3d575..b6adf67cbe82 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -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"; From 8c0a9c12b1b35b43ff44a82534f0557c9236159b Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 12:42:30 -0400 Subject: [PATCH 3/9] python3Packages.cadquery: mark broken Needs update and fixed dependencies (nontrivial) to work with recent Python and with opencascade-occt and recent pythonocc-core. (Note the package already didn't build due to the Python 3.8 upper bound.) --- pkgs/development/python-modules/cadquery/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 15142e3d80e4..1eb8f73b7a77 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -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; }; } From cc12dbf5bb951bbbb2f0a5d3646967a03290e46c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 12:36:24 -0400 Subject: [PATCH 4/9] python3Packages.pythonocc-core: remove unused `smesh` dependency Use of `smesh` was removed in version 7.4.0 as per the NEWS file. --- .../python-modules/pythonocc-core/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 7873574b0a1b..cedf05029c9c 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -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 ]; From ba6b7b05cf42edfd0cfdf72ac96491f902b44b3e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 12:29:00 -0400 Subject: [PATCH 5/9] smesh: remove at 6.7.6 No commits to master since 2019, depends on similarly unmaintained opencascade-oce, and mainly used for pythonocc-core package which is similarly unmaintained. --- pkgs/development/libraries/smesh/default.nix | 35 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/development/libraries/smesh/default.nix diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix deleted file mode 100644 index 478237f866cb..000000000000 --- a/pkgs/development/libraries/smesh/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5bd2366c1bbe..1d09af8ba2c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1646,6 +1646,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3483d061f889..f7b49d47611d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13266,10 +13266,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 { }; From 5a82c61519f2961f9e0cecae8b5c246fa4d2f0b1 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 13:35:21 -0400 Subject: [PATCH 6/9] elmerfem: unstable-2023-02-03 -> 2023-09-18 --- pkgs/applications/science/physics/elmerfem/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 41a0e00ae784..e63203a93f28 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -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 ]; From f799d5a52729dfdf02a6cb4dc2d5cc1c7129ecee Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 13:39:46 -0400 Subject: [PATCH 7/9] openscenegraph: opencascade -> opencascade-occt --- .../libraries/openscenegraph/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 42bcf436b9a2..f45bda41b863 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -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"; From b2e44fcf6f56f6e7f497fe4071c3cbd709101517 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 12:27:53 -0400 Subject: [PATCH 8/9] opencascade: remove at 0.18.3 --- .../libraries/opencascade/default.nix | 65 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 - 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/development/libraries/opencascade/default.nix diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix deleted file mode 100644 index 2934558b5875..000000000000 --- a/pkgs/development/libraries/opencascade/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1d09af8ba2c3..d699bf5fe255 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1261,6 +1261,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7b49d47611d..f421bea715f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24457,9 +24457,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 { }; From f110cccd04ab950e949aa03b90ce5e6999840ae3 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 18 Sep 2023 12:44:16 -0400 Subject: [PATCH 9/9] vtk_8: remove --- pkgs/development/libraries/vtk/8.x.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/libraries/vtk/8.x.nix diff --git a/pkgs/development/libraries/vtk/8.x.nix b/pkgs/development/libraries/vtk/8.x.nix deleted file mode 100644 index ad84ec163cfa..000000000000 --- a/pkgs/development/libraries/vtk/8.x.nix +++ /dev/null @@ -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"; - } - ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f421bea715f0..73d9c2f9fe43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25651,17 +25651,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;