gplates: 2.2.0 -> 2.3.0

+55 -20
+54 -16
pkgs/applications/science/misc/gplates/default.nix
··· 1 - { lib, stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal 2 - , proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }: 1 + { lib 2 + , mkDerivation 3 + , fetchurl 4 + , cmake 5 + , doxygen 6 + , graphviz 7 + , boost 8 + , cgal_5 9 + , gdal 10 + , glew 11 + , gmp 12 + , libGL 13 + , libGLU 14 + , mpfr 15 + , proj 16 + , python3 17 + , qtxmlpatterns 18 + , qwt 19 + }: 3 20 4 - stdenv.mkDerivation rec { 21 + let 22 + python = python3.withPackages (ps: with ps; [ 23 + numpy 24 + ]); 25 + boost' = boost.override { 26 + enablePython = true; 27 + inherit python; 28 + }; 29 + cgal = cgal_5.override { 30 + boost = boost'; 31 + }; 32 + in mkDerivation rec { 5 33 pname = "gplates"; 6 - version = "2.2.0"; 34 + version = "2.3.0"; 7 35 8 36 src = fetchurl { 9 - url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2"; 10 - sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; 37 + name = "gplates_${version}_src.tar.bz2"; 38 + url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428"; 39 + sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96"; 11 40 }; 12 41 13 - nativeBuildInputs = [ cmake ]; 42 + nativeBuildInputs = [ 43 + cmake 44 + doxygen 45 + graphviz 46 + ]; 47 + 14 48 buildInputs = [ 15 - qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2 16 - doxygen graphviz gmp mpfr 17 - (boost.override { 18 - enablePython = true; 19 - python = python2; 20 - }) 49 + boost' 50 + cgal 51 + gdal 52 + glew 53 + gmp 54 + libGL 55 + libGLU 56 + mpfr 57 + proj 58 + python 59 + qtxmlpatterns 60 + qwt 21 61 ]; 22 62 23 - NIX_CFLAGS_LINK="-ldl -lpthread -lutil"; 24 - 25 63 meta = with lib; { 26 64 description = "Desktop software for the interactive visualisation of plate-tectonics"; 27 65 homepage = "https://www.gplates.org"; 28 - license = licenses.gpl2; 66 + license = licenses.gpl2Only; 29 67 platforms = platforms.all; 30 68 }; 31 69 }
+1 -4
pkgs/top-level/all-packages.nix
··· 31118 31118 31119 31119 gildas = callPackage ../applications/science/astronomy/gildas { }; 31120 31120 31121 - gplates = callPackage ../applications/science/misc/gplates { 31122 - boost = boost160; 31123 - cgal = cgal.override { boost = boost160; }; 31124 - }; 31121 + gplates = libsForQt5.callPackage ../applications/science/misc/gplates { }; 31125 31122 31126 31123 gravit = callPackage ../applications/science/astronomy/gravit { }; 31127 31124