From a8f5edc39c753953dd88a1fb560d16f6379cc140 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 13 Aug 2024 13:15:44 -0400 Subject: [PATCH 1/2] paraview: apply nixfmt --- .../graphics/paraview/default.nix | 46 +++++++++++++++---- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 3394fc6825c7..a8961ac49b6f 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,8 +1,28 @@ -{ lib, stdenv, fetchFromGitLab, fetchurl -, boost, cmake, ffmpeg, wrapQtAppsHook, qtbase, qtx11extras -, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper -, ninja, mpi, python3, tbb, libGLU, libGL -, withDocs ? true +{ + lib, + stdenv, + fetchFromGitLab, + fetchurl, + boost, + cmake, + ffmpeg, + wrapQtAppsHook, + qtbase, + qtx11extras, + qttools, + qtxmlpatterns, + qtsvg, + gdal, + gfortran, + libXt, + makeWrapper, + ninja, + mpi, + python3, + tbb, + libGLU, + libGL, + withDocs ? true, }: let @@ -26,7 +46,8 @@ let }) ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "paraview"; inherit version; @@ -86,7 +107,10 @@ in stdenv.mkDerivation rec { qtsvg ]; - postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in + postInstall = + let + docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; + in lib.optionalString withDocs '' mkdir -p ${docDir}; for docFile in ${lib.concatStringsSep " " docFiles}; do @@ -95,7 +119,13 @@ in stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ - (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) + (python3.withPackages ( + ps: with ps; [ + numpy + matplotlib + mpi4py + ] + )) ]; meta = with lib; { From ea92738f92ef4bc3359e824a9670deb63db9ec57 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 13 Aug 2024 13:15:19 -0400 Subject: [PATCH 2/2] paraview: 5.12.0 -> 5.12.1 --- pkgs/applications/graphics/paraview/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index a8961ac49b6f..f8afeb1f828b 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -26,7 +26,7 @@ }: let - version = "5.12.0"; + version = "5.12.1"; docFiles = [ (fetchurl { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - hash = "sha256-PAD48IlOU39TosjfTiDz7IjEeYEP/7F75M+8dYBIUxI="; + hash = "sha256-jbqMqj3D7LTwQ+hHIPscCHw4TfY/BR2HuVmMYom2+dA="; fetchSubmodules = true; }; @@ -128,11 +128,12 @@ stdenv.mkDerivation rec { )) ]; - meta = with lib; { - homepage = "https://www.paraview.org/"; + meta = { + homepage = "https://www.paraview.org"; description = "3D Data analysis and visualization application"; - license = licenses.bsd3; - maintainers = with maintainers; [ guibert ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ guibert ]; + changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion version)}-release-notes"; + platforms = lib.platforms.linux; }; }