Commit graph

12231 commits

Author SHA1 Message Date
Baptist BENOIST
736b295bc5 vtk: Use the Qt libraries as an argument instead of a boolean
To prevent multiple Qt libraries when developing with a custom one, the Qt
support can now be activated by directly supplying the Qt libraries as an
argument (qtLib).

qtSDK and qtFull users/developers now just have to define an override such
as the following one in order to use it inside their development
environment:

vtk.override { qtLib = qt4SDK; };

The previous behavior is still the same for vtk and vtkWithQt4 end-users.

Change-Id: I517762d4ff7de46d32cc46e6e725fd62737caa52
2013-10-28 10:00:32 +01:00
bbenoist
90872e2b6c Add Qt 5.1.1 and its SDK
Consider this as a first step towards the integration of Qt5 into nixpkgs,
it does not yet intends to replace Qt4 on every packages even if possible.
My goal here is to have a first derivation in common between people who
needs qt5 for development purposes.

The derivation has been written from scratch but I took care to read at the
version 4 to re-integrate some patches which are still compatible. However,
I did not had enough time to test gtkStyle and flashplayerFix as I do not
use any of them. Also, OSX users will have to do some extra work because
I do not have any mac.

Finally, as some configure flags have changed and in an hope to provide a
clear package definition before it becomes mature, I voluntary added some
flags which are default. Once every option will be mastered, we will just
have to redo a pass on qt5 configure flags and remove the ones which are
set by default.
2013-10-21 09:36:45 +02:00
bbenoist
4edbaf9aa1 mesa: Minor fix on GL/gl.h
Apply a fix which prevented to use -DGL_GLEXT_LEGACY, -Werror and -Wundef
to be used together. This produced a build fail on any software meeting
these requirements.
2013-10-21 09:36:45 +02:00
bbenoist
45851fc39a qtcreator: Make the qt package optional and introduce the QtSDK
To give the ability to use a different Qt version than the default one
(which can build 3 different times Qt Libraries if we mixed the default
one, the qtcreator one and the version including all the examples and the
docs).

Right now a developer can choose to directly install the QtSDK which
includes a "full" (developerBuild + docs + examples) Qt version and uses
it to build QtCreator.

The possibility to only install QtCreator and its previous behavior has
been kept for flexibility purposes (we do not need to force someone on the
SDK approach).
2013-10-21 09:36:45 +02:00
bbenoist
36e31d5aad qtcreator: Update to 2.8.1 2013-10-17 10:44:04 +02:00
Shea Levy
a9c65b31b9 Add gurobi package
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-16 10:38:20 -04:00
Eelco Dolstra
11960d2f47 nss: Update to 3.15.2 2013-10-15 17:24:33 +02:00
Eelco Dolstra
df5eadd283 nspr: Update to 4.10.1 2013-10-15 17:24:33 +02:00
Sander van der Burg
521ea15f14 We need to use ... to allow other parameters 2013-10-15 16:48:42 +02:00
Sander van der Burg
f24e20f1e3 Support Xcode 5.0 2013-10-15 16:32:38 +02:00
Sander van der Burg
ce7f235a09 Make arbitrary arguments to the generic builder possible 2013-10-15 16:32:16 +02:00
Peter Simons
347132478b haskell-HTTP: jailbreak to fix build with GHC 7.7 2013-10-15 11:59:12 +02:00
Peter Simons
e7b25c78a5 haskell-snap: jailbreak to fix build with recent versions of lens 2013-10-15 11:59:12 +02:00
Peter Simons
57b5927d6a haskell-cryptohash: re-enable the test suite 2013-10-15 11:59:12 +02:00
Peter Simons
7edfd67fe0 haskell-accelerate: jailbreak to fix build with recent versions of fclables 2013-10-15 11:59:12 +02:00
Peter Simons
4cdefbb926 haskell-errors: jailbreak to fix build with either 4.x 2013-10-15 11:59:12 +02:00
Peter Simons
7eaefcae45 haskell-groupoids: don't try to build documentation; this package is empty 2013-10-15 11:59:12 +02:00
Peter Simons
93727ab861 haskell-comonads-fd: don't try to build documentation; this package is empty 2013-10-15 11:59:11 +02:00
Peter Simons
18c9c07bde haskell-yesod-form: update to version 1.3.3 2013-10-15 11:59:11 +02:00
Peter Simons
c4385c4db7 haskell-yesod-core: update to version 1.2.4.5 2013-10-15 11:59:11 +02:00
Peter Simons
ad55ea940b haskell-yesod-bin: update to version 1.2.3.4 2013-10-15 11:59:11 +02:00
Peter Simons
1811b175d6 haskell-warp: update to version 1.3.10.1 2013-10-15 11:59:11 +02:00
Peter Simons
c933c31141 haskell-wai-app-static: update to version 1.3.3 2013-10-15 11:59:11 +02:00
Peter Simons
97f3968921 haskell-trifecta: update to version 1.2.1.1 2013-10-15 11:59:11 +02:00
Peter Simons
7fc3d75dd4 haskell-tasty: update to version 0.3.1 2013-10-15 11:59:11 +02:00
Peter Simons
1c1f7f7e7f haskell-shakespeare-js: update to version 1.2.0.1 2013-10-15 11:59:11 +02:00
Peter Simons
e4857cf3c6 haskell-semigroupoids: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons
271be21f5a haskell-semigroupoid-extras: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons
d217bfd571 haskell-reducers: update to version 3.10.1 2013-10-15 11:59:11 +02:00
Peter Simons
054a313221 haskell-profunctors: update to version 4.0.1 2013-10-15 11:59:11 +02:00
Peter Simons
860175c660 haskell-profunctor-extras: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons
345423eb5d haskell-pointed: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons
a8c8120626 haskell-parsers: update to version 0.10 2013-10-15 11:59:11 +02:00
Peter Simons
0bfd9cd3a1 haskell-numbers: update to version 3000.2.0.0 2013-10-15 11:59:11 +02:00
Peter Simons
343b43297d haskell-lens: update to version 3.10 2013-10-15 11:59:11 +02:00
Peter Simons
358cbd05ac haskell-keys: update to version 3.10 2013-10-15 11:59:11 +02:00
Peter Simons
5a309bd661 haskell-intervals: update to version 0.2.2.1 2013-10-15 11:59:11 +02:00
Peter Simons
0e35a09bf4 haskell-heist: update to version 0.13.0.2 2013-10-15 11:59:10 +02:00
Peter Simons
3323a090c8 haskell-hamlet: update to version 1.1.7.3 2013-10-15 11:59:10 +02:00
Peter Simons
595e1c47e0 haskell-groupoids: update to version 4.0 2013-10-15 11:59:10 +02:00
Peter Simons
9fbc5fd4fb haskell-free: update to version 4.0 2013-10-15 11:59:10 +02:00
Peter Simons
b88b7f4986 haskell-either: update to version 4.0 2013-10-15 11:59:10 +02:00
Peter Simons
502c2eda48 haskell-distributive: update to version 0.3.2 2013-10-15 11:59:10 +02:00
Peter Simons
f572643b42 haskell-cryptohash: update to version 0.11.1 2013-10-15 11:59:10 +02:00
Peter Simons
9274cb0a49 haskell-comonads-fd: update to version 4.0 2013-10-15 11:59:10 +02:00
Peter Simons
48c44876ae haskell-comonad: update to version 4.0 2013-10-15 11:59:10 +02:00
Peter Simons
40ad6ff9b3 haskell-comonad-transformers: update to version 4.0 2013-10-15 11:59:10 +02:00
Peter Simons
8090704e3d haskell-charset: update to version 0.3.5.1 2013-10-15 11:59:10 +02:00
Peter Simons
27c80e7712 haskell-bifunctors: update to version 4.1.0.1 2013-10-15 11:59:10 +02:00
Peter Simons
b3119ba705 haskell-aeson: update to version 0.6.2.1 2013-10-15 11:59:10 +02:00