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

freecad: updating to 0.14

Browse Source 
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
This commit is contained in:
Lluís Batlle i Rossell 2014-08-01 13:50:09 +02:00
parent 688824cc60
commit 5e35fef0eb
6 changed files with 30 additions and 35 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 , pyqt4, makeWrapper
, matplotlib, pycollada }:
, matplotlib, pycollada, pyside, pysideShiboken }:
stdenv.mkDerivation rec {
name = "freecad-${version}";
version = "0.13.1830";
version = "0.14.3702";
src = fetchurl {
url = "mirror://sourceforge/free-cad/${name}.tar.gz";
sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm";
sha256 = "1jcx7d3mp2wxkd20qdvr4vlf7h5wb0jgab9dl63sicdz88swy97f";
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib
pycollada
pycollada pyside pysideShiboken
];
enableParallelBuilding = true;
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
'';
patches = [ ./pythonpath.patch ./cmake.patch ];
patches = [ ./pythonpath.patch ];
meta = {
homepage = http://free-cad.sourceforge.net/;

11
pkgs/development/python-modules/pyside/apiextractor.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchgit, cmake, libxml2, libxslt, python27Packages, qt4 }:
{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }:
stdenv.mkDerivation {
name = "pyside-apiextractor-0.10.7-6-gdcb1195";
name = "pyside-apiextractor-0.10.10";
src = fetchgit {
url = "git://github.com/PySide/Apiextractor.git";
rev = "dcb11958cabe518630f9f2d2bebd9f8711c2b15b";
sha256 = "d7b6cb16d11b6134de17a15635d0b5ad7460d31d7870cafe23a690141b9a2274";
src = fetchurl {
url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz";
sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3";
};
enableParallelBuilding = true;

11
pkgs/development/python-modules/pyside/default.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchgit, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }:
{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }:
stdenv.mkDerivation {
name = "pyside-1.0.9";
name = "pyside-1.2.2";
src = fetchgit {
url = "git://github.com/PySide/PySide.git";
rev = "4e47b3284fd8715b68342e755cd06ba02b1df0de";
sha256 = "1fd302e78c5dea8a9c312bd493c04240f2383517ee745d9df2b070f15f0ab515";
src = fetchurl {
url = "http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2";
sha256 = "1qbahpcjwl8d7zvvnc18nxpk1lbifpvjk8pi24ifbvvqcdsdzad1";
};
enableParallelBuilding = true;

11
pkgs/development/python-modules/pyside/generatorrunner.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }:
{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }:
stdenv.mkDerivation {
name = "pyside-generatorrunner-0.6.15";
name = "pyside-generatorrunner-0.6.16";
src = fetchgit {
url = "git://github.com/PySide/Generatorrunner.git";
rev = "567ca6effaecdf97b33d1d13eada23bafe0f7535";
sha256 = "182aba79af9fc865337f4befc96faf3eaca1ab9bcb902a57e0a68af49f071c74";
src = fetchurl {
url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz";
sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj";
};
enableParallelBuilding = true;

11
pkgs/development/python-modules/pyside/shiboken.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchgit, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }:
{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }:
stdenv.mkDerivation {
name = "pyside-shiboken-1.0.7-73-g9f110f8";
name = "pyside-shiboken-1.2.2";
src = fetchgit {
url = "git://github.com/PySide/Shiboken.git";
rev = "9f110f83c213867e15b0141a802ebbf74f2ed9f7";
sha256 = "4618ed113fb20840fd9acb7d08460eb257f630cbca6d61113c16549a6bb651cd";
src = fetchurl {
url = "http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2";
sha256 = "1i75ziljl7rgb88nf26hz6cm8jf5kbs9r33b1j8zs4z33z7vn9bn";
};
enableParallelBuilding = true;

11
pkgs/development/python-modules/pyside/tools.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchgit, cmake, pyside, python27, qt4, pysideShiboken }:
{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }:
stdenv.mkDerivation {
name = "pyside-tools-0.2.13";
name = "pyside-tools-0.2.15";
src = fetchgit {
url = "git://github.com/PySide/Tools.git";
rev = "23e0712360442e50f34be0d6e4651b8c4c806d47";
sha256 = "68f059e4936fb8dfae6aa3a463db8c28adcb7bd050b29e8b6fef82431f72da07";
src = fetchurl {
url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz";
sha256 = "0x4z3aq7jgar74gxzwznl3agla9i1dcskw5gh11jnnwwn63ffzwa";
};
enableParallelBuilding = true;