Lluís Batlle i Rossell
6d15eabdc1
Merging from trunk (the callPackage change)
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
2010-08-03 08:14:13 +00:00
Yury G. Kudryashov
aadea685af
Restrict qt-4.7 to linux only
...
svn path=/nixpkgs/trunk/; revision=22909
2010-08-02 21:47:28 +00:00
Yury G. Kudryashov
230c31d020
Really make qt-4.7
...
svn path=/nixpkgs/trunk/; revision=22896
2010-08-02 17:18:56 +00:00
Lluís Batlle i Rossell
5417c720fd
Merging from trunk.
...
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Yury G. Kudryashov
59a8bc0744
qt-4.7.0-beta2: fool phonon version
...
Qt guys updated source files but not version number
svn path=/nixpkgs/trunk/; revision=22833
2010-07-31 13:05:46 +00:00
Yury G. Kudryashov
d15fdc71f0
trailing spaces
...
svn path=/nixpkgs/trunk/; revision=22832
2010-07-31 13:05:22 +00:00
Yury G. Kudryashov
2835a98378
Add qt-4.7.0-beta2
...
svn path=/nixpkgs/trunk/; revision=22830
2010-07-30 19:45:07 +00:00
Peter Simons
70240d36ac
Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=22400
2010-06-23 14:35:18 +00:00
Yury G. Kudryashov
b39389560f
Add meta.platforms to qt4 and merkaartor
...
Should fix one of hydra evaluation errors
svn path=/nixpkgs/trunk/; revision=22360
2010-06-21 17:06:08 +00:00
Armijn Hemel
1f9754bf07
update to 4.6.3, will let the buildfarm test
...
svn path=/nixpkgs/trunk/; revision=22185
2010-06-08 13:01:44 +00:00
Yury G. Kudryashov
169fee5644
Add qt-4.7-beta1 with low priority
...
svn path=/nixpkgs/trunk/; revision=21659
2010-05-07 20:08:37 +00:00
Yury G. Kudryashov
0864c1422e
Move qt-4.x into subfolder
...
svn path=/nixpkgs/trunk/; revision=21658
2010-05-07 20:08:31 +00:00
