BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vtk, vtkWithQt5: bump from vtk_8 to vtk_9

Browse source
This commit is contained in:
Ben Darwin 2023-01-24 11:48:56 -05:00
parent b296ddd494
commit 4095b8232c
15 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/freecad/default.nix
View file

@ -39,7 +39,7 @@
, soqt , soqt
, spaceNavSupport ? stdenv.isLinux , spaceNavSupport ? stdenv.isLinux
, swig , swig
, vtk , vtk_8
, wrapQtAppsHook , wrapQtAppsHook
, wrapGAppsHook , wrapGAppsHook
, xercesc , xercesc
@ -97,7 +97,7 @@ mkDerivation rec {
shiboken2 shiboken2
soqt soqt
swig swig
vtk vtk_8
xercesc xercesc
zlib zlib
] ++ lib.optionals spaceNavSupport [ ] ++ lib.optionals spaceNavSupport [

4
pkgs/applications/science/electronics/appcsxcad/default.nix
View file

@ -5,7 +5,7 @@
, csxcad , csxcad
, qcsxcad , qcsxcad
, hdf5 , hdf5
, vtkWithQt5 , vtk_8_withQt5
, qtbase , qtbase
, fparser , fparser
, tinyxml , tinyxml
@ -32,7 +32,7 @@ mkDerivation {
csxcad csxcad
qcsxcad qcsxcad
hdf5 hdf5
vtkWithQt5 vtk_8_withQt5
qtbase qtbase
fparser fparser
tinyxml tinyxml

4
pkgs/applications/science/electronics/csxcad/default.nix
View file

@ -5,7 +5,7 @@
, tinyxml , tinyxml
, hdf5 , hdf5
, cgal_5 , cgal_5
, vtk , vtk_8
, boost , boost
, gmp , gmp
, mpfr , mpfr
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
boost boost
gmp gmp
mpfr mpfr
vtk vtk_8
fparser fparser
tinyxml tinyxml
hdf5 hdf5

4
pkgs/applications/science/electronics/openems/default.nix
View file

@ -5,7 +5,7 @@
, fparser , fparser
, tinyxml , tinyxml
, hdf5 , hdf5
, vtk , vtk_8
, boost , boost
, zlib , zlib
, cmake , cmake
@ -39,7 +39,7 @@ stdenv.mkDerivation {
fparser fparser
tinyxml tinyxml
hdf5 hdf5
vtk vtk_8
boost boost
zlib zlib
csxcad csxcad

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtkWithQt5}: { lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtk_8_withQt5}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elmerfem"; pname = "elmerfem";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libGL libGL
libGLU libGLU
opencascade opencascade
vtkWithQt5 vtk_8_withQt5
]; ];
preConfigure = '' preConfigure = ''

4
pkgs/applications/video/rtabmap/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack , libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack
, xorg }: , xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
qtbase qtbase
libGL libGL
libGLU libGLU
vtkWithQt5 vtk_8_withQt5
]; ];
# Disable warnings that are irrelevant to us as packagers # Disable warnings that are irrelevant to us as packagers

4
pkgs/development/libraries/gdcm/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, enableVTK ? true , enableVTK ? true
, vtk , vtk_8
, ApplicationServices , ApplicationServices
, Cocoa , Cocoa
, enablePython ? false , enablePython ? false
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals enableVTK [ buildInputs = lib.optionals enableVTK [
vtk vtk_8
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
ApplicationServices ApplicationServices
Cocoa Cocoa

4
pkgs/development/libraries/itk/generic.nix
View file

@ -1,7 +1,7 @@
{ version, rev, sourceSha256 }: { version, rev, sourceSha256 }:
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper { lib, stdenv, fetchFromGitHub, cmake, makeWrapper
, pkg-config, libX11, libuuid, xz, vtk, Cocoa }: , pkg-config, libX11, libuuid, xz, vtk_8, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "itk"; pname = "itk";
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake xz makeWrapper ]; nativeBuildInputs = [ cmake xz makeWrapper ];
buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; buildInputs = [ libX11 libuuid vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, { lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb,
OpenCL, Cocoa OpenCL, Cocoa
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkg-config ]; nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [ buildInputs = [
libGL libGLU libXmu freetype fontconfig expat freeimage vtk libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8
gl2ps tbb gl2ps tbb
] ]
++ optionals stdenv.isDarwin [OpenCL Cocoa] ++ optionals stdenv.isDarwin [OpenCL Cocoa]

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

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

4
pkgs/development/libraries/opencv/4.x.nix
View file

@ -48,7 +48,7 @@
, enableGtk3 ? false , enableGtk3 ? false
, gtk3 , gtk3
, enableVtk ? false , enableVtk ? false
, vtk , vtk_8
, enableFfmpeg ? true , enableFfmpeg ? true
, ffmpeg , ffmpeg
, enableGStreamer ? true , enableGStreamer ? true
@ -253,7 +253,7 @@ stdenv.mkDerivation {
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3 ++ lib.optional enableGtk3 gtk3
++ lib.optional enableVtk vtk ++ lib.optional enableVtk vtk_8
++ lib.optional enableJPEG libjpeg ++ lib.optional enableJPEG libjpeg
++ lib.optional enablePNG libpng ++ lib.optional enablePNG libpng
++ lib.optional enableTIFF libtiff ++ lib.optional enableTIFF libtiff

4
pkgs/development/libraries/pcl/default.nix
View file

@ -6,7 +6,7 @@
, qhull , qhull
, flann , flann
, boost , boost
, vtk , vtk_8
, eigen , eigen
, pkg-config , pkg-config
, qtbase , qtbase
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
libpng libpng
libtiff libtiff
qhull qhull
vtk vtk_8
]; ];
cmakeFlags = lib.optionals stdenv.isDarwin [ cmakeFlags = lib.optionals stdenv.isDarwin [

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

@ -1,4 +1,4 @@
{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }: { lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk_8, zlib, tbb }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.0.0"; version = "2.0.0";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ cmake gtest ]; nativeBuildInputs = [ cmake gtest ];
buildInputs = [ boost eigen python3 vtk zlib tbb ]; buildInputs = [ boost eigen python3 vtk_8 zlib tbb ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/BioMedIA/MIRTK"; homepage = "https://github.com/BioMedIA/MIRTK";

4
pkgs/development/libraries/science/electronics/qcsxcad/default.nix
View file

@ -4,7 +4,7 @@
, cmake , cmake
, csxcad , csxcad
, tinyxml , tinyxml
, vtkWithQt5 , vtk_8_withQt5
, qtbase , qtbase
}: }:
@ -33,7 +33,7 @@ mkDerivation {
buildInputs = [ buildInputs = [
csxcad csxcad
tinyxml tinyxml
vtkWithQt5 vtk_8_withQt5
qtbase qtbase
]; ];

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

@ -11071,7 +11071,7 @@ with pkgs;
rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix {
pcl = pcl.override { vtk = vtkWithQt5; }; pcl = pcl.override { vtk_8 = vtk_8_withQt5; };
}; };
rtaudio = callPackage ../development/libraries/audio/rtaudio { rtaudio = callPackage ../development/libraries/audio/rtaudio {
@ -23444,8 +23444,8 @@ with pkgs;
vtk_9_withQt5 = vtk_9.override { enableQt = true; }; vtk_9_withQt5 = vtk_9.override { enableQt = true; };
vtk = vtk_8; vtk = vtk_9;
vtkWithQt5 = vtk_8_withQt5; vtkWithQt5 = vtk_9_withQt5;
vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { };