diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-13 22:51:14 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-13 22:51:14 +0200 |
| commit | 8bc86ee03659e75491f2fff19ef9251458ca321b (patch) | |
| tree | c56ab90b0cd84cf1dbb89a83a7c65b04b5b73eea /pkgs/applications/graphics/paraview | |
| parent | 7257e9980e34dfa5c64c784d449cf2fe5ccb0629 (diff) | |
paraview: 5.11.2 -> 5.12.0
Diffstat (limited to 'pkgs/applications/graphics/paraview')
| -rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch | 28 |
2 files changed, 3 insertions, 37 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 4fec6b2ad13c3..3394fc6825c75 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,13 +6,13 @@ }: let - version = "5.11.2"; + version = "5.12.0"; docFiles = [ (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; name = "Tutorial.pdf"; - hash = "sha256-KIcd5GG+1L3rbj4qdLbc+eDa5Wy4+nqiVIxfHu5Tdpg="; + hash = "sha256-ETA799peqP9RAjcqPBwVb8egKfQJAuIXNgso+k8o50Q="; }) (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - hash = "sha256-fe/4xxxlkal08vE971FudTnESFfGMYzuvSyAMS6HSxI="; + hash = "sha256-PAD48IlOU39TosjfTiDz7IjEeYEP/7F75M+8dYBIUxI="; fetchSubmodules = true; }; @@ -86,12 +86,6 @@ in stdenv.mkDerivation rec { qtsvg ]; - patches = [ - ./dont-redefine-strlcat.patch - ]; - - env.CXXFLAGS = "-include cstdint"; - postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in lib.optionalString withDocs '' mkdir -p ${docDir}; diff --git a/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch b/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch deleted file mode 100644 index d7e24e7d73054..0000000000000 --- a/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2023-11-27 21:11:33.562949964 +0100 -+++ b/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2023-11-27 21:11:33.562949964 +0100 -@@ -1246,7 +1246,7 @@ - #define write_numrecs vtknetcdf_write_numrecs - - /* Only define strlcat conditionally, as it's provided by system headers on the BSDs. */ --#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(_BSD_SOURCE) -+#ifndef HAVE_STRLCAT - #define strlcat vtknetcdf_strlcat - #endif - ---- a/VTK/ThirdParty/netcdf/vtknetcdf/config.h.in 2023-11-27 21:10:35.113525241 +0100 -+++ b/VTK/ThirdParty/netcdf/vtknetcdf/config.h.in 2023-11-27 21:10:55.241982399 +0100 -@@ -1,7 +1,5 @@ - /* config.h.in. Generated from configure.ac by autoheader. */ - --#include "vtk_netcdf_mangle.h" -- - /* Define if building universal (internal helper macro) */ - #cmakedefine AC_APPLE_UNIVERSAL_BUILD - -@@ -621,4 +619,6 @@ - #endif - #endif - -+#include "vtk_netcdf_mangle.h" -+ - #include "ncconfigure.h" |