Commit Graph

515 Commits

Author SHA1 Message Date
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Michael Raskin
646868b2e6 Adding Otter theorem prover. The development is frozen, but because of that Otter is considered a very reliable prover from soundness point of view. 2013-05-09 12:23:27 +04:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Bjørn Forsman
36c6a05fd9 spyder: create desktop menu item 2013-05-06 20:52:58 +02:00
Bjørn Forsman
78169ec020 spyder: add recommended and optional dependencies
Spyder says about itself that it has

  ...the support of IPython (enhanced interactive Python interpreter) and
  popular Python libraries such as NumPy (linear algebra), SciPy (signal
  and image processing) or matplotlib (interactive 2D/3D plotting).

So I think having those available as default is a the right thing to to.
(We can easily make a stripped down spyder expression if needed later.)

I've added the list of recommended and optional dependencies as
described here:

  http://pythonhosted.org/spyder/installation.html#dependencies
2013-05-06 20:36:17 +02:00
Bjørn Forsman
8095d76a73 spyder: new package
Spyder (previously known as Pydee) is a powerful interactive development
environment for the Python language with advanced editing, interactive
testing, debugging and introspection features.

The name Spyder comes from Scientific PYthon Development EnviRonment.
2013-05-05 13:13:45 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Michael Raskin
e7b491a7e1 Update E prover 2013-04-21 16:30:40 +04:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Michael Ashton
7b01680d87 kicad: upgrade to stable version 20130325, libraries to r220
- changed to require wxWidgets 2.9 -- seems to satisfy requirement for
libgtkprint, even with gtk2
2013-03-31 19:17:02 -07:00
Marco Maggesi
fa2d85fded Update HOL Light to rev 157 2013-03-25 10:56:57 +01:00
Peter Simons
7df21af242 wxmaxima: don't try to build this package on FreeBSD 2013-03-22 12:53:07 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Michael Raskin
d5288c7e3a TPTP had a bugfix without version change 2013-03-09 14:24:45 +04:00
Vladimír Čunát
7421ee673c qucs: minor update and fix for new gcc 2013-02-24 15:11:19 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell
bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Vladimír Čunát
9885d04033 Revert "WIP", sorry, I got confused, somehow
This reverts commit 524d9b656e.
2013-02-17 11:02:25 +01:00
Vladimír Čunát
524d9b656e WIP 2013-02-17 11:01:20 +01:00
Vladimír Čunát
c55f5ae19d tulip: update to fix compilation with libpng-1.6 2013-02-16 16:16:32 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Marco Maggesi
42a4178c2b Update HOL Light to revision 155 2013-02-08 15:26:35 +01:00
Marco Maggesi
34411286a6 Update HOL Light to revision 154 2013-02-08 15:20:06 +01:00
Rickard Nilsson
1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Peter Simons
ff461b0755 maxima: update to version 5.29.1 2013-01-19 02:31:21 +01:00
Peter Simons
c296be5519 stellarium: update to version 0.11.4a 2013-01-19 02:26:03 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra
f286cc65b1 Fix bad URLs lacking a scheme 2013-01-14 18:26:46 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Lluís Batlle i Rossell
430957b020 boinc: fix it; the binaries didn't start. 2013-01-08 23:28:39 +01:00
Lluís Batlle i Rossell
8de96cb04d boinc: updating to 7.0.44
now it builds.

I started to use fetchgit instead of fetchsvn, because the upstream
doc pages talk about git more than svn.
2013-01-08 23:28:39 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Michael Raskin
b31e6aa794 Merge pull request #231 from RSzibele/master
Added Logisim 2.7.1
2012-12-27 06:32:03 -08:00
RSzibele
fcdf685793 Added Logisim-2.7.1. 2012-12-27 16:25:39 +01:00
Michael Raskin
dd6ef6229e Merge pull request #226 from maggesi/hol_light_updates
Update HOL Light (and fix installation)
2012-12-27 05:33:24 -08:00
Peter Simons
591f85f17e celestia: add version 1.6.1 2012-12-25 11:26:53 +01:00
Marco Maggesi
49e4824b8a Update HOL Light (and fix installation) 2012-12-23 18:46:09 +01:00
Michael Raskin
1c3434cc16 Update E prover 2012-12-09 00:36:38 +04:00
Michael Raskin
8a1f312621 Update golly 2012-12-04 10:10:28 +04:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons
614c7501bc Merge pull request #193 from badi/gromacs
Add Gromacs
2012-11-28 01:16:17 -08:00
Shea Levy
3b8796ee9d Fix tarball 2012-11-26 20:31:45 -05:00
Florian Friesdorf
6a17fe1563 fix xoscope - thx archlinux! 2012-11-26 16:07:51 +01:00
Badi' Abdul-Wahid
06c522f739 remove reference to meta.nix 2012-11-23 15:46:49 +01:00
Badi' Abdul-Wahid
cba15c96f6 fix skipped indentation 2012-11-23 15:45:19 +01:00
Badi' Abdul-Wahid
7bdcb521b2 Update based on comments to pull request 2012-11-23 15:29:17 +01:00
Badi' Abdul-Wahid
85a33507ea Add GROMACS v4.5.5 2012-11-23 03:38:13 +01:00
Peter Simons
0757af1693 qfsm: add version 0.53.0 2012-11-11 20:32:41 +01:00
Mathijs Kwik
5406e02594 tkgate: limit to i686-linux and x86_64-linux to fix channel build
powerpc-linux seems to have a problem
http://hydra.nixos.org/build/3315312
2012-11-11 14:12:42 +01:00
Peter Simons
86fa903f6c tkgate: add versions 1.8.7 and 2.0-b10 2012-11-08 17:30:50 +01:00
Peter Simons
85145941fa kicad: update homepage URL 2012-10-28 17:27:30 +01:00
Peter Simons
29035e15a4 ng-spice-rework: update to version 24 2012-10-28 17:27:13 +01:00
Peter Simons
a29717f41f stellarium: update to version 0.11.4 2012-10-19 10:19:41 +02:00
Peter Simons
24ec840736 wxmaxima: update to version 12.09.0 2012-10-19 10:12:31 +02:00
Peter Simons
5c59edb8f4 maxima: update to version 5.28.0 2012-10-19 10:12:31 +02:00
Peter Simons
64556b022b gravit: update to version 0.5.0 2012-10-10 19:25:42 +02:00
Russell O'Connor
46d9146d64 Update SSReflect to version 1.4 2012-09-10 23:15:54 +02:00
Marco Maggesi
286d068b37 Upgrade Isabelle proof assistant to version 2012 2012-09-04 14:34:31 +02:00
Russell O'Connor
525b8015e7 Fixing configure patch for coq 8.3. 2012-08-19 01:11:11 -04:00
Russell O'Connor
eafd2008f1 Correcting filename. 2012-08-19 01:06:15 -04:00
Russell O'Connor
706cbc9318 Update coq to 8.4 2012-08-19 01:01:30 -04:00
Lluís Batlle i Rossell
c88f2ecbcd gtkwave: updating to 3.3.39 2012-08-10 16:54:00 +02:00
Peter Simons
b8d0aebe51 stellarium: update to version 0.11.3 2012-08-04 13:00:29 +02:00
Shea Levy
c5c41832f0 Merge branch 'tptp-5.4.0' of https://github.com/7c6f434c/nixpkgs
Update tptp to 5.4

It builds, and the change is a simple version+hash update.
2012-07-07 20:36:15 -04:00
Peter Simons
55ea7dc453 wxmaxima: update to version 12.04.0 2012-07-07 22:20:18 +02:00
Peter Simons
0c107996d3 maxima: update to version 5.27.0 2012-07-07 22:20:18 +02:00
Michael Raskin
2331ea4ec2 TPTP: update to 5.4.0 2012-07-07 20:32:48 +04:00
Yury G. Kudryashov
3640b0c1e9 Add GiNaC
svn path=/nixpkgs/trunk/; revision=34403
2012-06-09 13:09:41 +00:00
Marco Maggesi
5ca0b381e0 Update HOL Light to rev 141
svn path=/nixpkgs/trunk/; revision=34290
2012-05-30 20:53:13 +00:00
Russell O'Connor
dace27b4c4 Revert accidentaly patch of ssreflect.
svn path=/nixpkgs/trunk/; revision=34264
2012-05-28 20:57:54 +00:00
Russell O'Connor
417a07a0e9 Updatings ssreflect to depend on camlp5 version 6.
svn path=/nixpkgs/trunk/; revision=34263
2012-05-28 20:53:17 +00:00
Russell O'Connor
f02a71103a add support to make building coqide optional.
svn path=/nixpkgs/trunk/; revision=34262
2012-05-28 19:45:14 +00:00
Russell O'Connor
cfc8538326 Updating coq and ssreflect to patch level 4.
svn path=/nixpkgs/trunk/; revision=34146
2012-05-16 22:04:02 +00:00
Eelco Dolstra
bf2d945a02 * Disable some failing builds on specific platforms.
svn path=/nixpkgs/trunk/; revision=34033
2012-05-09 21:10:12 +00:00
Marco Maggesi
2cef87022c Update HOL Light to r134
svn path=/nixpkgs/trunk/; revision=33992
2012-05-05 16:46:53 +00:00
Michael Raskin
304facbf3b Adding LCI lambda calculus interpreter
svn path=/nixpkgs/trunk/; revision=33962
2012-05-01 05:07:39 +00:00
Michael Raskin
dd3ef46cac Update TPTP
svn path=/nixpkgs/trunk/; revision=33754
2012-04-12 07:23:52 +00:00
Michael Raskin
6bc87a1ac8 Add packages to GAP
svn path=/nixpkgs/trunk/; revision=33601
2012-04-05 04:46:11 +00:00
Peter Simons
fd8c16adb8 stellarium: updated to version 0.11.2
svn path=/nixpkgs/trunk/; revision=33538
2012-04-02 15:19:05 +00:00
Russell O'Connor
bba264d897 Adding forgotten configure_130312 patch for matitia.
svn path=/nixpkgs/trunk/; revision=33433
2012-03-26 19:11:25 +00:00
Russell O'Connor
ec5dda12d2 Reparing stable build of Matita.
Also correcting the version and simplifying the prerelease package of Matita.


svn path=/nixpkgs/trunk/; revision=33420
2012-03-25 21:27:30 +00:00
Russell O'Connor
510308e039 Adding a package for a preview release of Matita.
svn path=/nixpkgs/trunk/; revision=33418
2012-03-25 20:43:00 +00:00
Russell O'Connor
f9a5fa373e Upgrading HOL4 to version k.7.
svn path=/nixpkgs/trunk/; revision=33306
2012-03-20 19:11:22 +00:00
Marco Maggesi
dba8b32385 Update HOL Light to rev 128
svn path=/nixpkgs/trunk/; revision=33196
2012-03-17 16:36:36 +00:00
Marco Maggesi
699de0f3f9 Fix building of Coq and update to version 8.3pl3. (Forgot to save files)
svn path=/nixpkgs/trunk/; revision=33195
2012-03-17 16:30:23 +00:00
Marco Maggesi
af37461b11 Fix building of Coq and update to version 8.3pl3.
svn path=/nixpkgs/trunk/; revision=33194
2012-03-17 16:26:20 +00:00
Yury G. Kudryashov
75207a6a90 Try to update slr
Still fails to build because atlas doesn't provide full blas.

svn path=/nixpkgs/trunk/; revision=33164
2012-03-16 17:15:52 +00:00
Michael Raskin
7c0d7abdd7 Adding GAP discrete algebra system
svn path=/nixpkgs/trunk/; revision=32908
2012-03-08 18:23:47 +00:00
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
Peter Simons
e3984c2caf synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
2011-10-10 17:01:17 +00:00
Lluís Batlle i Rossell
c67c7d49b0 Boinc wanted to be told to link to libX11
svn path=/nixpkgs/trunk/; revision=29713
2011-10-07 19:01:27 +00:00
Lluís Batlle i Rossell
80d397413d Boinc can even run, but only if placed in the proper (writeable) path.
svn path=/nixpkgs/trunk/; revision=29712
2011-10-07 19:01:19 +00:00
Lluís Batlle i Rossell
fefaa7a6ea Adding boinc. It installs. I don't know how to use it.
svn path=/nixpkgs/trunk/; revision=29704
2011-10-06 20:25:05 +00:00
Shea Levy
01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Yury G. Kudryashov
9ee5230537 Move qt3/qt4 choice to .nix expressions
svn path=/nixpkgs/trunk/; revision=29404
2011-09-20 22:49:13 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Marco Maggesi
a9d2f34301 Update HOL Light to release 102
svn path=/nixpkgs/trunk/; revision=28718
2011-08-21 08:41:22 +00:00
Yury G. Kudryashov
a660093a4d Fix typo in URL
svn path=/nixpkgs/trunk/; revision=28603
2011-08-15 23:39:11 +00:00
Yury G. Kudryashov
0962beade0 Add avogadro
svn path=/nixpkgs/trunk/; revision=28596
2011-08-15 18:05:39 +00:00
Yury G. Kudryashov
48f1cd549f pari-gp-2.5.0
svn path=/nixpkgs/trunk/; revision=28440
2011-08-09 20:20:58 +00:00
Michael Raskin
946cd2431f Update LEO-II
svn path=/nixpkgs/trunk/; revision=28180
2011-08-05 18:22:40 +00:00
Michael Raskin
3e8a39ea61 Updating Maxima
svn path=/nixpkgs/trunk/; revision=28152
2011-08-04 15:13:15 +00:00
Peter Simons
c58754b390 stellarium: build this package on Linux only
Stellarium is supposed to compile on mesaPlatforms, but unfortunately our qt47
expression doesn't support platforms other than Linux.

svn path=/nixpkgs/trunk/; revision=27798
2011-07-15 12:47:20 +00:00
Peter Simons
fa99abdc89 gravit, stellarium: build software that depends on mesa only on mesa platforms
svn path=/nixpkgs/trunk/; revision=27790
2011-07-14 20:53:30 +00:00
Peter Simons
7c8871512d wxmaxima: ensure that wxMaxima will find Maxima even if it's not in $PATH
svn path=/nixpkgs/trunk/; revision=27745
2011-07-13 09:56:58 +00:00
Peter Simons
3cd02cd43d maxima: switch from clisp to sbcl, enable tk gui, and fix various impurities
* Build maxima with sbcl for better performance.

 * Enable the regression test suite.

 * Configure $PATH at start-up so that maxima knows how to find sbcl,
   wish, rlwrap, and gnuplot.

 * Move installed documentation and Emacs lisp modules into standard
   locations.

 * Enable parallel building.

svn path=/nixpkgs/trunk/; revision=27743
2011-07-13 09:13:32 +00:00
Peter Simons
8223f67929 Added stellarium 0.11.0.
svn path=/nixpkgs/trunk/; revision=27697
2011-07-10 20:17:44 +00:00
Peter Simons
3806050f60 gravit: enable support for lua 5.0.x
The build doesn't work with the latest version 5.1.x. Upstream is going
to release an update to fix this soon.

svn path=/nixpkgs/trunk/; revision=27693
2011-07-10 14:04:24 +00:00
Peter Simons
e7746a78ed gravit: added version 0.4.2
svn path=/nixpkgs/trunk/; revision=27677
2011-07-08 21:23:55 +00:00
Peter Simons
574eb09fa4 xplanet: move expression into new category "astronomy"
svn path=/nixpkgs/trunk/; revision=27676
2011-07-08 21:23:48 +00:00
Peter Simons
947610085d Added Eukleides, a geometry drawing language.
svn path=/nixpkgs/trunk/; revision=27655
2011-07-07 21:53:21 +00:00
Michael Raskin
b973f98afa Make tulip run without hassle. Unfortunately, some operations repeatably crash tulip even when built vs Qt4.6
svn path=/nixpkgs/trunk/; revision=27570
2011-07-01 09:53:11 +00:00
Michael Raskin
a4be010d31 Update Tulip
svn path=/nixpkgs/trunk/; revision=27566
2011-07-01 07:01:46 +00:00
Michael Raskin
d03599f8ce Adding TPTP
svn path=/nixpkgs/trunk/; revision=27468
2011-06-15 10:35:18 +00:00
Marco Maggesi
5b035e093d Update HOL Light to rev 92
svn path=/nixpkgs/trunk/; revision=27459
2011-06-14 17:09:19 +00:00
Marco Maggesi
1298fd8aba Update hol_light and cleanup:
* Update hol_light to rev 90
* Remove dmtcp checkpoint (it doesn't work properly).
* General cleanup and simplification

svn path=/nixpkgs/trunk/; revision=27290
2011-05-21 11:18:35 +00:00
Marco Maggesi
8e5beab31f Fix building of Isabelle2011
svn path=/nixpkgs/trunk/; revision=27253
2011-05-14 21:09:57 +00:00
Peter Simons
1c6d30e2ad wxmaxima: updated to version 11.04.0
svn path=/nixpkgs/trunk/; revision=27171
2011-05-06 07:35:22 +00:00
Peter Simons
b4e5853028 maxima: updated to version 5.24.0
svn path=/nixpkgs/trunk/; revision=27170
2011-05-06 07:35:15 +00:00
Eelco Dolstra
b61d3ab317 * Typo in attribute. This broke --meta --xml evaluation.
svn path=/nixpkgs/trunk/; revision=27142
2011-05-04 12:45:05 +00:00
Russell O'Connor
af59636bf5 adding ecm support to msieve.
svn path=/nixpkgs/trunk/; revision=26931
2011-04-23 12:36:36 +00:00
Russell O'Connor
699261d8df Adding ecm-6.2.3.
svn path=/nixpkgs/trunk/; revision=26930
2011-04-23 12:25:51 +00:00
Marco Maggesi
a041cad70a Update HOL Light to r89
svn path=/nixpkgs/trunk/; revision=26916
2011-04-21 14:39:29 +00:00
Russell O'Connor
3db6f63711 Package for msieve.
This would be better if gmp-emc were packaged as well.

svn path=/nixpkgs/trunk/; revision=26915
2011-04-21 12:48:07 +00:00
Michael Raskin
b4faf64bae Update Isabelle to an existing tarball...
svn path=/nixpkgs/trunk/; revision=26903
2011-04-20 12:24:34 +00:00
Russell O'Connor
bec1a9c44f update coq to 8.3pl1
update ssreflect to 1.3pl1

svn path=/nixpkgs/trunk/; revision=26692
2011-04-05 11:59:25 +00:00
Lluís Batlle i Rossell
df786c07dc Updating gtkwave
svn path=/nixpkgs/trunk/; revision=26454
2011-03-22 11:36:58 +00:00
Andres Löh
c2090d1be3 Added JAGS.
svn path=/nixpkgs/trunk/; revision=26396
2011-03-17 14:45:36 +00:00
Michael Raskin
662fa0a13b Fix updated maxima build
svn path=/nixpkgs/trunk/; revision=25799
2011-02-08 10:35:58 +00:00
Peter Simons
e0d871ba91 maxima: added buildInput 'texinfo' so that the reference documentation can be built
svn path=/nixpkgs/trunk/; revision=25797
2011-02-07 17:37:22 +00:00
Peter Simons
7795e5ec24 pkgs/applications/science/math/wxmaxima/default.nix: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25796
2011-02-07 14:49:25 +00:00
Peter Simons
80c344d0cf pkgs/applications/science/math/maxima: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25795
2011-02-07 14:47:42 +00:00
Peter Simons
0c3dcddbf3 pkgs/applications/science/math/wxmaxima: updated to version 0.8.7
svn path=/nixpkgs/trunk/; revision=25787
2011-02-07 11:35:42 +00:00
Peter Simons
a4cf1b8456 pkgs/applications/science/math/maxima: updated to version 5.23.2
svn path=/nixpkgs/trunk/; revision=25786
2011-02-07 11:35:35 +00:00
Marco Maggesi
436e1d72a7 * Coq: fix compilation of coqide (path to lablgkt)
svn path=/nixpkgs/trunk/; revision=25360
2011-01-03 13:49:15 +00:00
Michael Raskin
e55aa52856 Fix lablgtk reference
svn path=/nixpkgs/trunk/; revision=25341
2011-01-02 17:25:18 +00:00
Russell O'Connor
88ec92d14c Matita and its dependencies.
svn path=/nixpkgs/trunk/; revision=25328
2010-12-31 17:48:55 +00:00
Eelco Dolstra
aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Marco Maggesi
51d6c8df91 * Handle variable createFindlibDestdir correctly in ocaml-findlib
* Fix HOL Light derivation

svn path=/nixpkgs/trunk/; revision=25269
2010-12-23 19:28:06 +00:00
Eelco Dolstra
c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Marco Maggesi
e7accaf8d3 * Update camlp5
svn path=/nixpkgs/trunk/; revision=25206
2010-12-20 10:32:22 +00:00
Ludovic Courtès
e60ba9135a SimGrid 3.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25180
2010-12-17 17:48:12 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Michael Raskin
07dd3f074b Adding MiniSAT
svn path=/nixpkgs/trunk/; revision=24984
2010-12-05 19:54:27 +00:00
Michael Raskin
011d71dcb8 Adding PARI/GP
svn path=/nixpkgs/trunk/; revision=24983
2010-12-05 19:11:21 +00:00
Michael Raskin
7768fa0178 Fix installation layout
svn path=/nixpkgs/trunk/; revision=24982
2010-12-05 19:08:32 +00:00
Michael Raskin
5cb3f8b659 Missing Singular files
svn path=/nixpkgs/trunk/; revision=24981
2010-12-05 18:37:47 +00:00
Michael Raskin
6b8abaa29e Adding OpenSMT
svn path=/nixpkgs/trunk/; revision=24978
2010-12-05 18:22:14 +00:00
Michael Raskin
a9f70d542d Adding CVC3 satisfiability modulo theory (SMT) solver
svn path=/nixpkgs/trunk/; revision=24975
2010-12-05 17:28:41 +00:00
Michael Raskin
44ac8c5ea1 Adding iProver
svn path=/nixpkgs/trunk/; revision=24969
2010-12-04 18:39:44 +00:00
Michael Raskin
86e44e72bf Adding SPASS
svn path=/nixpkgs/trunk/; revision=24967
2010-12-04 11:43:01 +00:00
Michael Raskin
64ed7e705d Adding Satallax prover
svn path=/nixpkgs/trunk/; revision=24963
2010-12-03 11:26:34 +00:00
Michael Raskin
c32bd62956 Adding LEO2 automated higher-order prover
svn path=/nixpkgs/trunk/; revision=24952
2010-12-01 21:29:42 +00:00
Michael Raskin
373fabf1c0 Fix settings patch for Isabelle
svn path=/nixpkgs/trunk/; revision=24951
2010-12-01 21:29:20 +00:00
Michael Raskin
b89881d098 Update Isabelle
svn path=/nixpkgs/trunk/; revision=24950
2010-12-01 21:25:21 +00:00
Lluís Batlle i Rossell
d71ad68d43 Fixing the verilog URL (contributed by Antonio Vargas)
svn path=/nixpkgs/trunk/; revision=24935
2010-11-30 11:24:12 +00:00
Lluís Batlle i Rossell
ab6627ac0e Fix for the verilog package, from Antonio Vargas Gonzalez
svn path=/nixpkgs/trunk/; revision=24934
2010-11-30 11:23:36 +00:00
Lluís Batlle i Rossell
0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Lluís Batlle i Rossell
4018d18e96 Committing patch adding verilog from Antonio Vargas Gonzalez
From his original, I adapted some spacing, and removed the release.nix reference
(superfluous having set meta.platforms)

svn path=/nixpkgs/trunk/; revision=24860
2010-11-25 22:01:14 +00:00
Michael Raskin
3c452363ce Use a patch to fix make 3.82 build of Coq
svn path=/nixpkgs/branches/stdenv-updates/; revision=24817
2010-11-23 05:54:58 +00:00
Michael Raskin
9d124b1c70 Fix DrGeo build
svn path=/nixpkgs/branches/stdenv-updates/; revision=24762
2010-11-19 04:07:34 +00:00
Lluís Batlle i Rossell
8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Peter Simons
a09b681e3e pkgs/applications/science/math/maxima: fixed location of "info" and "man" directories
svn path=/nixpkgs/trunk/; revision=24605
2010-11-05 14:35:37 +00:00
Marco Maggesi
0430167083 Update Coq
svn path=/nixpkgs/trunk/; revision=24597
2010-11-04 11:24:27 +00:00
Marco Maggesi
078587a846 Update HOL Light
svn path=/nixpkgs/trunk/; revision=24591
2010-11-03 22:20:05 +00:00
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Lluís Batlle i Rossell
0cb7f90cac Adding caneda
svn path=/nixpkgs/trunk/; revision=24450
2010-10-24 17:01:09 +00:00
Lluís Batlle i Rossell
227c632d18 Adding qucs
svn path=/nixpkgs/trunk/; revision=24449
2010-10-24 17:00:57 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Marco Maggesi
4e5db40581 Update HOL Light to version 20100820 (rev57 on google code).
Also replace the monolitic derivation hol_light_binaries with smaller
derivations.  Now the installation works as follows:

# Install the base system and a script "start_hol_light"
$ nix-env -i hol_light_sources hol_light

# Install a checkpointed executable with the core library preloaded
$ nix-env -i hol_light_core_dmtcp

# Install HOL Light binaries preloaded with other specific libraries:
$ nix-env -i hol_light_multivariate_dmtcp
$ nix-env -i hol_light_complex_dmtcp
$ nix-env -i hol_light_sosa_dmtcp
$ nix-env -i hol_light_card_dmtcp


svn path=/nixpkgs/trunk/; revision=23815
2010-09-15 21:41:18 +00:00
Marco Maggesi
44f2d4439f Change the name of the coq derivation to coq-devel-8.3pre1
i.e., remove the version from the name.  Nix has its own mechanism to
prevent a packages to be upgraded.  Instead we distinguish development
version (coq-dev-VERSION) from stable versions (coq-VERSION).

Also remove derivation for coq-8.3-beta0-1 which is now superseded by
coq-devel-8.3pre1.


svn path=/nixpkgs/trunk/; revision=23813
2010-09-15 19:39:48 +00:00
Marco Maggesi
8ab6f9861c Add coq-8.3rc1
Note: In this version we introduce a new schema for the name of the coq
derivations where the coq version is included in the name (i.e.,
"coq8.3-8.3pre1" instead of "coq-8.3pre1").  The reason for this is that often
coq releases introduce several incompatibilities.  Thus I argue that, in
general, users do not want nix-env to upgrade automatically form one release to
another.  Also version string "8.3pre1" is used instead of "8.3-rc1" to trigger
the nix mechanism for versions comparison.


svn path=/nixpkgs/trunk/; revision=23803
2010-09-14 21:15:58 +00:00
Marco Maggesi
df21c86e08 Improve hol_light:
*   Upgrade hol_light to the latest svn version on google code (r57).

  *   Improve and semplify the mechanism for the generation of checkpointed binaries.

  *   Make hol to work with camlp5 and thus with recent version of ocaml (>=3.10, <=3.11).

  *   Remove ocaml_with_sources which is not needed anymore.

svn path=/nixpkgs/trunk/; revision=23685
2010-09-08 13:07:45 +00:00
Lluís Batlle i Rossell
6acc186e0e Fixing the catalan locale for kicad (it had the wrong encoding written)
svn path=/nixpkgs/trunk/; revision=23554
2010-08-31 09:24:49 +00:00
Lluís Batlle i Rossell
aa86a0c4a2 Fixing kicad so it not only builds, but it also runs and finds the library of components.
svn path=/nixpkgs/trunk/; revision=23552
2010-08-31 08:19:28 +00:00
Lluís Batlle i Rossell
cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Peter Simons
49c437a31e pkgs/applications/science/math/maxima: use a correct license tag
Thanks, Ludovic.

svn path=/nixpkgs/trunk/; revision=23466
2010-08-26 17:57:14 +00:00
Peter Simons
098b763939 pkgs/applications/science/logic/prover9: fixed trivial syntax error
svn path=/nixpkgs/trunk/; revision=23453
2010-08-26 12:06:05 +00:00
Peter Simons
2c4c301c9b pkgs/applications/science/math/wxmaxima: updated to version 0.8.6
svn path=/nixpkgs/trunk/; revision=23451
2010-08-26 11:53:17 +00:00
Peter Simons
83ae38861e pkgs/applications/science/math/maxima: added license tag
svn path=/nixpkgs/trunk/; revision=23450
2010-08-26 11:51:10 +00:00
Peter Simons
88b126b9ca pkgs/applications/science/math/maxima: build this package on Unix'ish platforms, but not on Windows
svn path=/nixpkgs/trunk/; revision=23449
2010-08-26 11:49:54 +00:00
Peter Simons
24e71fa8fc pkgs/applications/science/math/maxima: updated to version 5.22.1
svn path=/nixpkgs/trunk/; revision=23448
2010-08-26 11:44:43 +00:00
Peter Simons
403938b004 pkgs/applications/science/logic/prover9: updated homepage and license
svn path=/nixpkgs/trunk/; revision=23447
2010-08-26 11:42:41 +00:00
Peter Simons
340d4a6ddd pkgs/applications/science/logic/prover9: initial version
svn path=/nixpkgs/trunk/; revision=23446
2010-08-26 11:37:05 +00:00
Michael Raskin
4f6c18925d Fix installation for updated E prover release
svn path=/nixpkgs/trunk/; revision=23435
2010-08-26 04:34:20 +00:00
Michael Raskin
05c7e81eaa Move E prover to applications/science/logic
svn path=/nixpkgs/trunk/; revision=23434
2010-08-25 22:38:11 +00:00
Peter Simons
970b3402e9 pkgs/applications/science/logic/hol: initial version
svn path=/nixpkgs/trunk/; revision=23430
2010-08-25 19:50:24 +00:00
Lluís Batlle i Rossell
689b834242 Updating gtkwave
svn path=/nixpkgs/trunk/; revision=23391
2010-08-24 10:00:19 +00:00
Lluís Batlle i Rossell
397a10aba2 Adding Kicad
svn path=/nixpkgs/trunk/; revision=23352
2010-08-22 12:09:47 +00:00
Lluís Batlle i Rossell
f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Lluís Batlle i Rossell
3a3867869a Adding tetgen
svn path=/nixpkgs/trunk/; revision=23138
2010-08-12 10:59:05 +00:00
Lluís Batlle i Rossell
039b660b5b Making lynx, yacas and alsa-lib crossbuild
svn path=/nixpkgs/branches/stdenv-updates/; revision=23130
2010-08-11 20:11:12 +00:00
Lluís Batlle i Rossell
456d3f41ae Adding a yacas needed patch for it to build
svn path=/nixpkgs/trunk/; revision=23077
2010-08-09 22:42:48 +00:00
Lluís Batlle i Rossell
9cba74c95a Adding 'yacas', a CAS implemented in C++.
svn path=/nixpkgs/trunk/; revision=23074
2010-08-09 21:58:21 +00:00
Marco Maggesi
c0f343b752 Update Coq to version 8.2pl2 (patch by roconnor)
svn path=/nixpkgs/trunk/; revision=22971
2010-08-05 18:44:42 +00:00
Eelco Dolstra
cc84ac9e84 svn path=/nixpkgs/trunk/; revision=22880 2010-08-02 16:01:55 +00:00
Eelco Dolstra
f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Ludovic Courtès
35cbabdab4 ViTE from SVN.
svn path=/nixpkgs/trunk/; revision=22696
2010-07-22 09:01:42 +00:00
Michael Raskin
b1eb6c96a8 Update Tulip. Unicode support should be available now.
svn path=/nixpkgs/trunk/; revision=22484
2010-07-06 07:25:07 +00:00
Michael Raskin
a10b9e1d3a Specifying golly license
svn path=/nixpkgs/trunk/; revision=22393
2010-06-23 10:02:44 +00:00