diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 24 | ||||
-rw-r--r-- | pkgs/applications/science/biology/spades/default.nix | 4 |
2 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index ac01c28ebd4bf..d0351e98ee01c 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, qtbase , qttools, python -, libGLU, libGL , libXt, qtx11extras, qtxmlpatterns , mkDerivation }: +{ +stdenv, fetchFromGitHub, cmake, makeWrapper +,qtbase, qttools, python, libGLU, libGL +,libXt, qtx11extras, qtxmlpatterns +, mkDerivation +}: mkDerivation rec { pname = "paraview"; @@ -49,20 +53,20 @@ mkDerivation rec { # Paraview links into the Python library, resolving symbolic links on the way, # so we need to put the correct sitePackages (with numpy) back on the path - preFixup = '' - wrapQtApp $out/bin/paraview \ + postInstall = '' + wrapProgram $out/bin/paraview \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvbatch \ + wrapProgram $out/bin/pvbatch \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvpython \ + wrapProgram $out/bin/pvpython \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.paraview.org/; description = "3D Data analysis and visualization application"; - license = licenses.free; - maintainers = with maintainers; [ guibert ]; - platforms = platforms.linux; + license = stdenv.lib.licenses.free; + maintainers = with stdenv.lib.maintainers; [guibert]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index 08a6a0d250957..a195f79010a7a 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.14.0"; + version = "3.13.1"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "1ffxswd2ngkpy1d6l3lb6a9cmyy1fglbdsws00b3m1k22zaqv60q"; + sha256 = "0giayz197lmq2108filkn9izma3i803sb3iskv9hs5snzdr9p8ld"; }; nativeBuildInputs = [ cmake ]; |