paraview: cleanup, format

+6 -7
+6 -7
pkgs/applications/graphics/paraview/default.nix
··· 7 7 8 8 let 9 9 version = "5.9.1"; 10 - major = "5.9"; 11 10 12 11 docFiles = [ 13 12 (fetchurl { 14 - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; 13 + 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"; 15 14 name = "Tutorial.pdf"; 16 15 sha256 = "1knpirjbz3rv8p8n03p39vv8vi5imvxakjsssqgly09g0cnsikkw"; 17 16 }) 18 17 (fetchurl { 19 - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; 18 + 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"; 20 19 name = "GettingStarted.pdf"; 21 20 sha256 = "14xhlvg7s7d5amqf4qfyamx2a6b66zf4cmlfm3s7iw3jq01x1lx6"; 22 21 }) 23 22 (fetchurl { 24 - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${major}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; 23 + url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; 25 24 name = "CatalystGuide.pdf"; 26 25 sha256 = "133vcfrbg2nh15igl51ns6gnfn1is20vq6j0rg37wha697pmcr4a"; 27 26 }) ··· 79 78 ]; 80 79 81 80 buildInputs = [ 82 - libGLU libGL 81 + libGLU 82 + libGL 83 83 libXt 84 84 mpi 85 85 tbb ··· 93 93 qtsvg 94 94 ]; 95 95 96 - postInstall = let docDir = "$out/share/paraview-${major}/doc"; in 96 + postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in 97 97 lib.optionalString withDocs '' 98 98 mkdir -p ${docDir}; 99 99 for docFile in ${lib.concatStringsSep " " docFiles}; do ··· 112 112 maintainers = with maintainers; [ guibert ]; 113 113 platforms = platforms.linux; 114 114 }; 115 - 116 115 }