diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2016-07-07 09:24:49 +0200 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2016-07-07 09:24:49 +0200 |
| commit | 51c6c98529a6b9197bf99276561d582e9aef0154 (patch) | |
| tree | 394d3d90ff5bb8433723b5331e74b5de63de35b8 /pkgs | |
| parent | fe2468b88cbc586232a86aedf8e00facf8919219 (diff) | |
| download | nixpkgs-51c6c98529a6b9197bf99276561d582e9aef0154.tar nixpkgs-51c6c98529a6b9197bf99276561d582e9aef0154.tar.gz nixpkgs-51c6c98529a6b9197bf99276561d582e9aef0154.tar.bz2 nixpkgs-51c6c98529a6b9197bf99276561d582e9aef0154.tar.lz nixpkgs-51c6c98529a6b9197bf99276561d582e9aef0154.tar.xz nixpkgs-51c6c98529a6b9197bf99276561d582e9aef0154.tar.zst nixpkgs-51c6c98529a6b9197bf99276561d582e9aef0154.zip | |
freecad: 0.15 -> 0.16
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 0390021d839..482abe2126f 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b2c7013c7..716eca125f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c78799ffe1..26b63524cf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 ]; + }; } |