colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freecad: 0.15 -> 0.16

Browse Source
This commit is contained in:
Rickard Nilsson 2016-07-07 09:24:49 +02:00
parent fe2468b88c
commit 51c6c98529
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/freecad/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper
, matplotlib, pycollada, pyside, pysideTools, pysideShiboken }:
, matplotlib, pycollada, pyside, pysideTools, pysideShiboken, pivy }:
stdenv.mkDerivation rec {
name = "freecad-${version}";
version = "0.15";
version = "0.16";
src = fetchurl {
url = https://github.com/FreeCAD/FreeCAD/archive/0.15.tar.gz;
sha256 = "1vndvywvq86hyhmg629bkn5ag4lk2mg1pl4dq7jvbjvbrczb12fc";
url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc";
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
zlib python swig gfortran soqt libf2c makeWrapper matplotlib
pycollada pyside pysideShiboken pysideTools
pycollada pyside pysideShiboken pysideTools pivy
];
enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -12924,7 +12924,7 @@ in
freecad = callPackage ../applications/graphics/freecad {
boost = boost155;
opencascade = opencascade_oce;
inherit (pythonPackages) matplotlib pycollada;
inherit (pythonPackages) matplotlib pycollada pivy;
};
freemind = callPackage ../applications/misc/freemind { };

11
pkgs/top-level/python-packages.nix
View File

@ -28329,4 +28329,15 @@ in modules // {
propagatedBuildInputs = with self; [ requests2 six dateutil ];
};
pivy = buildPythonPackage rec {
version = "20101207";
name = "pivy-${version}";
src = pkgs.fetchhg {
url = "https://bitbucket.org/Coin3D/pivy";
rev = "8eab90908f2a3adcc414347566f4434636202344";
sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf";
};
buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.mesa pkgs.xorg.libXi ];
};
}