alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #41139 from Moredread/freecad-0.17

Browse source 
freecad: 0.16.6712 -> 0.17
This commit is contained in:
xeji 2018-06-03 18:29:43 +02:00 committed by GitHub
parent 646767e961 95998480e6
commit e4ad5639c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/graphics/freecad/default.nix
View file

@ -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
];

24
pkgs/development/libraries/medfile/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, cmake, hdf5 }:
stdenv.mkDerivation rec {
name = "medfile-${version}";
version = "3.3.1";
src = fetchurl {
url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz";
sha256 = "1215sal10xp6xirgggdszay2bmx0sxhn9pgh7x0wg2w32gw1wqyx";
};
buildInputs = [ cmake hdf5 ];
checkPhase = "make test";
postInstall = "rm -r $out/bin/testc";
meta = with stdenv.lib; {
description = "Library to read and write MED files";
homepage = http://salome-platform.org/;
platforms = platforms.linux;
license = licenses.lgpl3Plus;
};
}

6
pkgs/top-level/all-packages.nix
View file

@ -3370,6 +3370,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
medfile = callPackage ../development/libraries/medfile {
hdf5 = hdf5_1_8;
};
memtester = callPackage ../tools/system/memtester { };
minergate = callPackage ../applications/misc/minergate { };
@ -15971,7 +15975,7 @@ with pkgs;
fomp = callPackage ../applications/audio/fomp { };
freecad = callPackage ../applications/graphics/freecad { };
freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; };
freemind = callPackage ../applications/misc/freemind { };