diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-03 18:29:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-03 18:29:43 +0200 |
commit | e4ad5639c0546bbe20e5a0db1bd98243ee8497e6 (patch) | |
tree | eda4cee9395a3fb35049be947fb46091bf342996 /pkgs/applications/graphics | |
parent | 646767e9615bd3fff5d0765f011393008d31bc4d (diff) | |
parent | 95998480e69c83fd236b085f6a44092a078197af (diff) | |
download | nixlib-e4ad5639c0546bbe20e5a0db1bd98243ee8497e6.tar nixlib-e4ad5639c0546bbe20e5a0db1bd98243ee8497e6.tar.gz nixlib-e4ad5639c0546bbe20e5a0db1bd98243ee8497e6.tar.bz2 nixlib-e4ad5639c0546bbe20e5a0db1bd98243ee8497e6.tar.lz nixlib-e4ad5639c0546bbe20e5a0db1bd98243ee8497e6.tar.xz nixlib-e4ad5639c0546bbe20e5a0db1bd98243ee8497e6.tar.zst nixlib-e4ad5639c0546bbe20e5a0db1bd98243ee8497e6.zip |
Merge pull request #41139 from Moredread/freecad-0.17
freecad: 0.16.6712 -> 0.17
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index d517306c1d61..87565a1e53e5 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }: +, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran +, soqt, libf2c, makeWrapper, makeDesktopItem +, mpi ? null }: + +assert mpi != null; let pythonPackages = python27Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.16.6712"; + version = "0.17"; src = fetchurl { url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "14hs26gvv7gbg9misxq34v4nrds2sbxjhj4yyw5kq3zbvl517alp"; + sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; }; buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c makeWrapper matplotlib + zlib python swig gfortran soqt libf2c makeWrapper matplotlib mpi vtk hdf5 medfile pycollada pyside pysideShiboken pysideTools pivy ]; |