summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2016-07-07 09:24:49 +0200
committerRickard Nilsson <rickynils@gmail.com>2016-07-07 09:24:49 +0200
commit51c6c98529a6b9197bf99276561d582e9aef0154 (patch)
tree394d3d90ff5bb8433723b5331e74b5de63de35b8 /pkgs/top-level
parentfe2468b88cbc586232a86aedf8e00facf8919219 (diff)
downloadnixlib-51c6c98529a6b9197bf99276561d582e9aef0154.tar
nixlib-51c6c98529a6b9197bf99276561d582e9aef0154.tar.gz
nixlib-51c6c98529a6b9197bf99276561d582e9aef0154.tar.bz2
nixlib-51c6c98529a6b9197bf99276561d582e9aef0154.tar.lz
nixlib-51c6c98529a6b9197bf99276561d582e9aef0154.tar.xz
nixlib-51c6c98529a6b9197bf99276561d582e9aef0154.tar.zst
nixlib-51c6c98529a6b9197bf99276561d582e9aef0154.zip
freecad: 0.15 -> 0.16
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix11
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5b2c7013c71..716eca125f19 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 0c78799ffe14..26b63524cf17 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 ];
+  };
 }