Yury G. Kudryashov
0210e20b5a
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Michael Raskin
e6fa414b64
Update and fix Tulip
...
svn path=/nixpkgs/trunk/; revision=32613
2012-02-27 07:10:05 +00:00
Lluís Batlle i Rossell
b7f1724543
Gtkwave needs the xz libraries to build.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32601
2012-02-26 21:02:03 +00:00
Yury G. Kudryashov
313a029f16
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
26f5bdfde1
xplanet: pass netpbm, edit meta
...
svn path=/nixpkgs/trunk/; revision=32390
2012-02-19 09:22:20 +00:00
Yury G. Kudryashov
045d0a3ea0
xplanet-1.2.2; builds with libpng-1.5
...
svn path=/nixpkgs/trunk/; revision=32389
2012-02-19 09:22:14 +00:00
Eelco Dolstra
9b4b40f053
* Caneda: fix the version number.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32361
2012-02-17 18:04:27 +00:00
Yury G. Kudryashov
e446dee4c3
Backport r32353 from stdenv-udpates
...
* Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only
one application still using it (Caneda), but upgrading it allowed it
to build with Qt 4.7.
Eelco, could you please fix the date in caneda version?
svn path=/nixpkgs/trunk/; revision=32359
2012-02-17 17:40:58 +00:00
Eelco Dolstra
31ebc5d950
* Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only
...
one application still using it (Caneda), but upgrading it allowed it
to build with Qt 4.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32353
2012-02-17 14:34:42 +00:00
Yury G. Kudryashov
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Peter Simons
1a7d345aab
wxmaxima: updated to version 12.01.0
...
svn path=/nixpkgs/trunk/; revision=32158
2012-02-09 13:22:57 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Marco Maggesi
7c90b6a9bc
Update HOL Light to rev 122.
...
svn path=/nixpkgs/trunk/; revision=31956
2012-02-01 14:37:50 +00:00
Eelco Dolstra
d4d7931a62
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Eelco Dolstra
c556a6ea46
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
...
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
0c79434ccb
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Yury G. Kudryashov
cced3d2b86
Fix compilation with qt-4.8
...
- Explicitly depend on libX11 and mesa
- Include GL/glu.h
svn path=/nixpkgs/trunk/; revision=31552
2012-01-14 18:03:41 +00:00
Yury G. Kudryashov
c2e38f32c0
avogadro: explicitly depend on pkg-config
...
svn path=/nixpkgs/trunk/; revision=31541
2012-01-14 18:03:01 +00:00
Lluís Batlle i Rossell
4238637b40
Adding GNU archimedes.
...
svn path=/nixpkgs/trunk/; revision=31505
2012-01-12 19:23:47 +00:00
Marco Maggesi
97d48a5426
Update HOL Light to rev 118
...
svn path=/nixpkgs/trunk/; revision=31468
2012-01-10 16:12:11 +00:00
Yury G. Kudryashov
9ee0a9df9b
svn merge ^/nixpkgs/trunk
...
A few trivial conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov
7e320a7043
State qt version (3/4) in packages, not in all-packages.nix
...
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Yury G. Kudryashov
394fd28e4e
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Michael Raskin
07de46c2fa
Update E prover
...
svn path=/nixpkgs/trunk/; revision=31269
2012-01-04 10:31:49 +00:00
Yury G. Kudryashov
2bca92e32d
Merge trunk
...
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Yury G. Kudryashov
995d3d3e03
tulip-3.6.1
...
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Yury G. Kudryashov
08761e83fc
Merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Marco Maggesi
fd64bc5289
Oops!
...
svn path=/nixpkgs/trunk/; revision=31126
2011-12-28 12:49:29 +00:00
Marco Maggesi
ff3b0ed420
Update HOL Light to r116
...
svn path=/nixpkgs/trunk/; revision=31125
2011-12-28 12:45:59 +00:00
Yury G. Kudryashov
f77741e018
merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Peter Simons
c7bed207d8
maxima: updated to version 5.26.0
...
svn path=/nixpkgs/trunk/; revision=31042
2011-12-22 12:30:19 +00:00
Lluís Batlle i Rossell
25bf67915d
Updating kicad.
...
svn path=/nixpkgs/trunk/; revision=30953
2011-12-18 14:49:39 +00:00
Yury G. Kudryashov
a670a7aca1
merge trunk
...
A few conflicts due to renames
svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
Marco Maggesi
74c3fc3085
Update HOL Light to rev 114
...
svn path=/nixpkgs/trunk/; revision=30922
2011-12-16 07:44:29 +00:00
Yury G. Kudryashov
b077940b3b
svn merge https://nixos.org/repos/nix/nixpkgs/trunk
...
No conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Michael Raskin
d5c702939c
Update Golly
...
svn path=/nixpkgs/trunk/; revision=30874
2011-12-13 21:00:42 +00:00
Eelco Dolstra
eda3fd1730
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Peter Simons
c86e037939
wxMaxima: updated to version 11.08.0
...
svn path=/nixpkgs/trunk/; revision=30774
2011-12-06 14:07:14 +00:00
Peter Simons
1382203c29
maxima: updated to version 5.25.1
...
svn path=/nixpkgs/trunk/; revision=30773
2011-12-06 14:07:11 +00:00
Lluís Batlle i Rossell
a9a03946df
Updating gtkwave
...
svn path=/nixpkgs/trunk/; revision=30738
2011-12-05 10:44:53 +00:00
Marco Maggesi
bf394d80ec
Update url for Isabelle2011
...
svn path=/nixpkgs/trunk/; revision=30574
2011-11-26 18:45:15 +00:00
Russell O'Connor
845f2a8658
adding camlp5 as a propogated build input to ulex 0.8
...
matita and ulex must build against the same version of camlp5, so in an attempt to force them to always be the same I am adding a propgatedBuildInput to ulex.
Granted Matita still requires camlp5_traditional and this is less obvious in the matita file now, so I am not entirely sure this is the right design choice.
svn path=/nixpkgs/trunk/; revision=30552
2011-11-24 19:43:03 +00:00
Marco Maggesi
fa47d66e22
Updated HOL Light to revision 112
...
svn path=/nixpkgs/trunk/; revision=30369
2011-11-10 15:35:53 +00:00
Peter Simons
368ac01473
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Peter Simons
4098071398
gravit: cosmetic
...
svn path=/nixpkgs/trunk/; revision=30314
2011-11-08 10:01:14 +00:00
Peter Simons
cf77f59ce9
stellarium: updated to version 0.11.1
...
svn path=/nixpkgs/trunk/; revision=30289
2011-11-07 10:04:40 +00:00
Peter Simons
7edf0e8eaf
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29870
2011-10-18 08:47:36 +00:00
Russell O'Connor
491c6e43b1
Package for picosat.
...
svn path=/nixpkgs/trunk/; revision=29869
2011-10-17 22:18:21 +00:00
Peter Simons
8dfef0f4a0
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
2011-10-14 22:06:50 +00:00
Lluís Batlle i Rossell
58e9385e70
Downgrading boinc to the last stable version.
...
svn path=/nixpkgs/trunk/; revision=29808
2011-10-13 08:58:45 +00:00