tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

vtk, vtkWithQt5: bump from vtk_8 to vtk_9

Ben Darwin 4095b823 b296ddd4

+31 -31
unified split
+2 -2
pkgs/applications/graphics/freecad/default.nix
··· 39 , soqt 40 , spaceNavSupport ? stdenv.isLinux 41 , swig 42 - , vtk 43 , wrapQtAppsHook 44 , wrapGAppsHook 45 , xercesc ··· 97 shiboken2 98 soqt 99 swig 100 - vtk 101 xercesc 102 zlib 103 ] ++ lib.optionals spaceNavSupport [
··· 39 , soqt 40 , spaceNavSupport ? stdenv.isLinux 41 , swig 42 + , vtk_8 43 , wrapQtAppsHook 44 , wrapGAppsHook 45 , xercesc ··· 97 shiboken2 98 soqt 99 swig 100 + vtk_8 101 xercesc 102 zlib 103 ] ++ lib.optionals spaceNavSupport [
+2 -2
pkgs/applications/science/electronics/appcsxcad/default.nix
··· 5 , csxcad 6 , qcsxcad 7 , hdf5 8 - , vtkWithQt5 9 , qtbase 10 , fparser 11 , tinyxml ··· 32 csxcad 33 qcsxcad 34 hdf5 35 - vtkWithQt5 36 qtbase 37 fparser 38 tinyxml
··· 5 , csxcad 6 , qcsxcad 7 , hdf5 8 + , vtk_8_withQt5 9 , qtbase 10 , fparser 11 , tinyxml ··· 32 csxcad 33 qcsxcad 34 hdf5 35 + vtk_8_withQt5 36 qtbase 37 fparser 38 tinyxml
+2 -2
pkgs/applications/science/electronics/csxcad/default.nix
··· 5 , tinyxml 6 , hdf5 7 , cgal_5 8 - , vtk 9 , boost 10 , gmp 11 , mpfr ··· 29 boost 30 gmp 31 mpfr 32 - vtk 33 fparser 34 tinyxml 35 hdf5
··· 5 , tinyxml 6 , hdf5 7 , cgal_5 8 + , vtk_8 9 , boost 10 , gmp 11 , mpfr ··· 29 boost 30 gmp 31 mpfr 32 + vtk_8 33 fparser 34 tinyxml 35 hdf5
+2 -2
pkgs/applications/science/electronics/openems/default.nix
··· 5 , fparser 6 , tinyxml 7 , hdf5 8 - , vtk 9 , boost 10 , zlib 11 , cmake ··· 39 fparser 40 tinyxml 41 hdf5 42 - vtk 43 boost 44 zlib 45 csxcad
··· 5 , fparser 6 , tinyxml 7 , hdf5 8 + , vtk_8 9 , boost 10 , zlib 11 , cmake ··· 39 fparser 40 tinyxml 41 hdf5 42 + vtk_8 43 boost 44 zlib 45 csxcad
+2 -2
pkgs/applications/science/physics/elmerfem/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtkWithQt5}: 2 3 stdenv.mkDerivation rec { 4 pname = "elmerfem"; ··· 29 libGL 30 libGLU 31 opencascade 32 - vtkWithQt5 33 ]; 34 35 preConfigure = ''
··· 1 + { lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtk_8_withQt5}: 2 3 stdenv.mkDerivation rec { 4 pname = "elmerfem"; ··· 29 libGL 30 libGLU 31 opencascade 32 + vtk_8_withQt5 33 ]; 34 35 preConfigure = ''
+2 -2
pkgs/applications/video/rtabmap/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen 2 , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect 3 - , libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack 4 , xorg }: 5 6 stdenv.mkDerivation rec { ··· 41 qtbase 42 libGL 43 libGLU 44 - vtkWithQt5 45 ]; 46 47 # Disable warnings that are irrelevant to us as packagers
··· 1 { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen 2 , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect 3 + , libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack 4 , xorg }: 5 6 stdenv.mkDerivation rec { ··· 41 qtbase 42 libGL 43 libGLU 44 + vtk_8_withQt5 45 ]; 46 47 # Disable warnings that are irrelevant to us as packagers
+2 -2
pkgs/development/libraries/gdcm/default.nix
··· 3 , fetchFromGitHub 4 , cmake 5 , enableVTK ? true 6 - , vtk 7 , ApplicationServices 8 , Cocoa 9 , enablePython ? false ··· 35 nativeBuildInputs = [ cmake ]; 36 37 buildInputs = lib.optionals enableVTK [ 38 - vtk 39 ] ++ lib.optionals stdenv.isDarwin [ 40 ApplicationServices 41 Cocoa
··· 3 , fetchFromGitHub 4 , cmake 5 , enableVTK ? true 6 + , vtk_8 7 , ApplicationServices 8 , Cocoa 9 , enablePython ? false ··· 35 nativeBuildInputs = [ cmake ]; 36 37 buildInputs = lib.optionals enableVTK [ 38 + vtk_8 39 ] ++ lib.optionals stdenv.isDarwin [ 40 ApplicationServices 41 Cocoa
+2 -2
pkgs/development/libraries/itk/generic.nix
··· 1 { version, rev, sourceSha256 }: 2 3 { lib, stdenv, fetchFromGitHub, cmake, makeWrapper 4 - , pkg-config, libX11, libuuid, xz, vtk, Cocoa }: 5 6 stdenv.mkDerivation rec { 7 pname = "itk"; ··· 53 ]; 54 55 nativeBuildInputs = [ cmake xz makeWrapper ]; 56 - buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 57 58 postInstall = '' 59 wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
··· 1 { version, rev, sourceSha256 }: 2 3 { lib, stdenv, fetchFromGitHub, cmake, makeWrapper 4 + , pkg-config, libX11, libuuid, xz, vtk_8, Cocoa }: 5 6 stdenv.mkDerivation rec { 7 pname = "itk"; ··· 53 ]; 54 55 nativeBuildInputs = [ cmake xz makeWrapper ]; 56 + buildInputs = [ libX11 libuuid vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 57 58 postInstall = '' 59 wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
+2 -2
pkgs/development/libraries/opencascade/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, 2 - pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, 3 OpenCL, Cocoa 4 }: 5 ··· 17 18 nativeBuildInputs = [ cmake ninja pkg-config ]; 19 buildInputs = [ 20 - libGL libGLU libXmu freetype fontconfig expat freeimage vtk 21 gl2ps tbb 22 ] 23 ++ optionals stdenv.isDarwin [OpenCL Cocoa]
··· 1 { lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, 2 + pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb, 3 OpenCL, Cocoa 4 }: 5 ··· 17 18 nativeBuildInputs = [ cmake ninja pkg-config ]; 19 buildInputs = [ 20 + libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8 21 gl2ps tbb 22 ] 23 ++ optionals stdenv.isDarwin [OpenCL Cocoa]
+2 -2
pkgs/development/libraries/opencv/3.x.nix
··· 22 , enablePython ? false, pythonPackages ? null 23 , enableGtk2 ? false, gtk2 24 , enableGtk3 ? false, gtk3 25 - , enableVtk ? false, vtk 26 , enableFfmpeg ? false, ffmpeg 27 , enableGStreamer ? false, gst_all_1 28 , enableTesseract ? false, tesseract, leptonica ··· 188 ++ lib.optional enablePython pythonPackages.python 189 ++ lib.optional enableGtk2 gtk2 190 ++ lib.optional enableGtk3 gtk3 191 - ++ lib.optional enableVtk vtk 192 ++ lib.optional enableJPEG libjpeg 193 ++ lib.optional enablePNG libpng 194 ++ lib.optional enableTIFF libtiff
··· 22 , enablePython ? false, pythonPackages ? null 23 , enableGtk2 ? false, gtk2 24 , enableGtk3 ? false, gtk3 25 + , enableVtk ? false, vtk_8 26 , enableFfmpeg ? false, ffmpeg 27 , enableGStreamer ? false, gst_all_1 28 , enableTesseract ? false, tesseract, leptonica ··· 188 ++ lib.optional enablePython pythonPackages.python 189 ++ lib.optional enableGtk2 gtk2 190 ++ lib.optional enableGtk3 gtk3 191 + ++ lib.optional enableVtk vtk_8 192 ++ lib.optional enableJPEG libjpeg 193 ++ lib.optional enablePNG libpng 194 ++ lib.optional enableTIFF libtiff
+2 -2
pkgs/development/libraries/opencv/4.x.nix
··· 48 , enableGtk3 ? false 49 , gtk3 50 , enableVtk ? false 51 - , vtk 52 , enableFfmpeg ? true 53 , ffmpeg 54 , enableGStreamer ? true ··· 253 ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 254 ++ lib.optional enableGtk2 gtk2 255 ++ lib.optional enableGtk3 gtk3 256 - ++ lib.optional enableVtk vtk 257 ++ lib.optional enableJPEG libjpeg 258 ++ lib.optional enablePNG libpng 259 ++ lib.optional enableTIFF libtiff
··· 48 , enableGtk3 ? false 49 , gtk3 50 , enableVtk ? false 51 + , vtk_8 52 , enableFfmpeg ? true 53 , ffmpeg 54 , enableGStreamer ? true ··· 253 ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 254 ++ lib.optional enableGtk2 gtk2 255 ++ lib.optional enableGtk3 gtk3 256 + ++ lib.optional enableVtk vtk_8 257 ++ lib.optional enableJPEG libjpeg 258 ++ lib.optional enablePNG libpng 259 ++ lib.optional enableTIFF libtiff
+2 -2
pkgs/development/libraries/pcl/default.nix
··· 6 , qhull 7 , flann 8 , boost 9 - , vtk 10 , eigen 11 , pkg-config 12 , qtbase ··· 55 libpng 56 libtiff 57 qhull 58 - vtk 59 ]; 60 61 cmakeFlags = lib.optionals stdenv.isDarwin [
··· 6 , qhull 7 , flann 8 , boost 9 + , vtk_8 10 , eigen 11 , pkg-config 12 , qtbase ··· 55 libpng 56 libtiff 57 qhull 58 + vtk_8 59 ]; 60 61 cmakeFlags = lib.optionals stdenv.isDarwin [
+2 -2
pkgs/development/libraries/science/biology/mirtk/default.nix
··· 1 - { lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }: 2 3 stdenv.mkDerivation rec { 4 version = "2.0.0"; ··· 32 ''; 33 34 nativeBuildInputs = [ cmake gtest ]; 35 - buildInputs = [ boost eigen python3 vtk zlib tbb ]; 36 37 meta = with lib; { 38 homepage = "https://github.com/BioMedIA/MIRTK";
··· 1 + { lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk_8, zlib, tbb }: 2 3 stdenv.mkDerivation rec { 4 version = "2.0.0"; ··· 32 ''; 33 34 nativeBuildInputs = [ cmake gtest ]; 35 + buildInputs = [ boost eigen python3 vtk_8 zlib tbb ]; 36 37 meta = with lib; { 38 homepage = "https://github.com/BioMedIA/MIRTK";
+2 -2
pkgs/development/libraries/science/electronics/qcsxcad/default.nix
··· 4 , cmake 5 , csxcad 6 , tinyxml 7 - , vtkWithQt5 8 , qtbase 9 }: 10 ··· 33 buildInputs = [ 34 csxcad 35 tinyxml 36 - vtkWithQt5 37 qtbase 38 ]; 39
··· 4 , cmake 5 , csxcad 6 , tinyxml 7 + , vtk_8_withQt5 8 , qtbase 9 }: 10 ··· 33 buildInputs = [ 34 csxcad 35 tinyxml 36 + vtk_8_withQt5 37 qtbase 38 ]; 39
+3 -3
pkgs/top-level/all-packages.nix
··· 11071 rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; 11072 11073 rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { 11074 - pcl = pcl.override { vtk = vtkWithQt5; }; 11075 }; 11076 11077 rtaudio = callPackage ../development/libraries/audio/rtaudio { ··· 23444 23445 vtk_9_withQt5 = vtk_9.override { enableQt = true; }; 23446 23447 - vtk = vtk_8; 23448 - vtkWithQt5 = vtk_8_withQt5; 23449 23450 vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; 23451
··· 11071 rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; 11072 11073 rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { 11074 + pcl = pcl.override { vtk_8 = vtk_8_withQt5; }; 11075 }; 11076 11077 rtaudio = callPackage ../development/libraries/audio/rtaudio { ··· 23444 23445 vtk_9_withQt5 = vtk_9.override { enableQt = true; }; 23446 23447 + vtk = vtk_9; 23448 + vtkWithQt5 = vtk_9_withQt5; 23449 23450 vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; 23451