alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
53674 commits 217 branches 121 tags 4.5 GiB
Commit graph

556 commits

Author SHA1 Message Date
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
John Wiegley 34de04149e twelf: Fix the source URL 2014-06-27 10:46:24 -07:00
John Wiegley ad96cc8bf9 twelf: new expression; prover for PL theory and logic 2014-06-26 15:54:45 -07:00
Peter Simons 1380b62fdb haskell-sloane: update to version 1.8 2014-06-13 15:41:25 +02:00
Austin Seipp fe9133d522 verifast: 14.5, x86_64 linux only 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-10 16:38:45 -05:00
John Wiegley c6261157f8 prooftree: new expression 0.12 2014-06-08 05:35:49 +00:00
Bjørn Forsman 61b79d2eee pulseview: new package 
PulseView is a Qt-based LA/scope/MSO GUI for sigrok (a signal analysis
software suite).

http://sigrok.org/
 2014-05-31 15:49:13 +02:00
Vladimír Čunát 8e9ead8656 berlios.de probably shut down, replace it 
The shutdown was announced years ago, only now it stopped working.
 2014-05-18 13:30:27 +02:00
Austin Seipp 3c8e1a9e47 Merge pull request #2680 from ellis/libR.so 
R: install lib/libR.so for use by other programs such as RStudio
 2014-05-17 16:41:42 -05:00
Austin Seipp 453f93cc92 Merge pull request #2514 from jwiegley/coq 
Make Coq buildable on any Unix
 2014-05-17 14:49:57 -05:00
Ellis Whitehead a257d14925 R: install lib/libR.so for use by other programs such as RStudio 2014-05-17 21:35:02 +02:00
Austin Seipp 552db25e7f nixpkgs: add abc version 040509 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 14:09:09 -05:00
Russell O'Connor 5bbcebf2db Bump coq version to 8.4pl4. 2014-05-12 22:17:00 -04:00
Peter Simons c61d607340 tkgate: rewrite expressions to get along without the broken 'libiconvOrLibc' attribute 2014-05-07 23:11:51 +02:00
John Wiegley 0a6b317071 Make Coq buildable on any Unix 2014-05-05 00:58:23 -05:00
Peter Simons ef05fad51a R: don't restrict meta.platforms to Linux; other architectures should build fine 2014-05-04 22:04:44 +02:00
Peter Simons a9258080b1 R: don't install the "recommended packages" 
These packages come with R, but if we install them as part of this build, then
we cannot update them without re-building R as well. Instead, we add those
packages to the R environment through the r-wrapper. This means that
recommended packages can be updated in cran-packgaes.nix, and those updates
have an effect on the installation without re-building R itself.
 2014-05-04 21:12:34 +02:00
Michael Raskin 4c55ae8588 Update TPTP and make URL set robust to moving old versions to archive 2014-05-03 00:53:46 +04:00
Austin Seipp 7d58646b08 z3/verifast: update license 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 19:09:24 -05:00
Peter Simons 4700996bc7 haskell-sloane: update to version 1.7.1 2014-05-01 21:57:03 +02:00
Austin Seipp 6d52463bd3 nixpkgs: add alt-ergo 0.95.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 02:42:31 -05:00
Austin Seipp 4ee4f76176 nixpkgs: add why3 0.83 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 02:30:39 -05:00
Austin Seipp d1a32414cd nixpkgs: add ltl2ba 1.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 02:30:34 -05:00
Eelco Dolstra fe4bc3cc80 Fix evaluation error 
http://hydra.nixos.org/build/10697257
 2014-04-29 20:40:28 +02:00
Peter Simons 6c5d7a63ac haskell-sloane: update to version 1.7 2014-04-29 01:35:45 +02:00
Peter Simons 1d7f7ad92f Merge pull request #2353 from jwiegley/sage 
Add expression for sage
 2014-04-28 22:46:27 +02:00
Austin Seipp aaa0304a45 nixpkgs: verifast 13.11.14 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-28 13:46:27 -05:00
Austin Seipp 0f1f2115e9 hol_light: fix script, upgrade to r189 
This also tweaks the version number to just use the SVN revision (rather
than date), since it's unambiguous and increasing anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-27 13:31:36 -05:00
Austin Seipp da0c8f33ef nixpkgs: yices 2.2.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-27 13:05:40 -05:00
Peter Simons 06f59807e6 qfsm: update meta.platforms settings for the new logic 2014-04-26 15:54:52 +02:00
Peter Simons 34a1db9202 tkgate: update meta.platforms settings for the new logic 2014-04-26 15:54:40 +02:00
Peter Simons 83df08830f qfsm: mark 'broken' because of build errors 
Upstream seems to have abandoned the package.
 2014-04-25 10:04:58 +02:00
Peter Simons 964f1e0e20 tkgate-2.x: mark 'broken' because the application segfaults after startup 2014-04-25 10:04:30 +02:00
John Wiegley 7ce39b067a Add expression for sage 2014-04-22 14:10:36 -05:00
Eric Kow 9e457049e4 megam: New package 
Maximum Entropy (GA) Model Optimization Package
 2014-04-15 14:00:56 +01:00
Peter Simons b5773eeccb R: update to version 3.1.0 2014-04-11 12:07:00 +02:00
Austin Seipp 5aa4495cb5 boolector: add version 1.5 and 1.6 
There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-07 09:17:05 -05:00
Peter Simons f2cb92f5d4 maxima: update to version 5.33.0 2014-04-03 20:13:35 +02:00
Shea Levy a0a135d5ef Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs 
z3: version 4.3.1
 2014-03-28 23:54:43 -04:00
Austin Seipp 2646eac8b2 z3: version 4.3.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-21 02:50:54 -05:00
Anders Claesson ac3de98f07 Add sloane -- a command line interface to OEIS. 2014-03-18 14:37:56 +00:00
Shea Levy 389c3951a8 Merge branch 'coq' of git://github.com/thoughtpolice/nixpkgs 
coq: 8.4pl2 -> 8.4pl3
 2014-03-15 13:03:10 -04:00
Michael Raskin 8dc61a6519 Update EKRHyper 2014-03-08 21:12:59 +04:00
Austin Seipp c0f779ceee coq: add myself to maintainer list. 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-07 20:52:33 -06:00
Austin Seipp fa118fc677 coq: 8.4pl2 -> 8.4pl3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-07 20:52:26 -06:00
Peter Simons 41e0214bb1 R: update to version 3.0.3 2014-03-07 22:51:39 +01:00
Peter Simons 19cb32a36c root: update from 5.34.14 to 5.34.15 2014-03-03 11:10:25 +01:00
Mathijs Kwik 2eedf210d3 celestia: fix install location 2014-02-17 06:49:05 +01:00
Vladimír Čunát 5559d4d47e kicad: disable parallel building, as it often fails 
CC @viric.
 2014-02-06 08:06:22 +01:00
Peter Simons 5fefec3944 pspp: update from 0.8.1 to 0.8.2 2014-01-25 20:58:49 +01:00
Petr Rockai ed5bd26574 STP: Simple Theorem Prover (a SMT solver for bitvectors & arrays). 2014-01-25 16:33:12 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Peter Simons 2991fdca52 root: enable parallel building 2014-01-20 18:26:32 +01:00
Peter Simons baeb19d0ce root: clean up meta section and move build into 'science/misc' section 2014-01-20 18:24:27 +01:00
Peter Simons 6475f0d1fe fricas: clean up meta section 2014-01-20 18:20:08 +01:00
Roger Mason e9928a1f25 Add CERN's 'root' Application Framework. 2014-01-20 18:11:09 +01:00
Roger Mason 3d1f6e3a75 Add fricas, a computer algebra system 2014-01-20 18:11:09 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Marco Maggesi b504b1b4cb Update HOL Light to revision 179 2014-01-14 15:21:09 +01:00
Peter Simons 25411b3c7b maxima: update to version 5.32.1 2014-01-13 17:05:45 +01:00
Vladimír Čunát d494ed15e7 celestia: fix build (inspired by Arch) 2014-01-05 10:42:55 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Nixpkgs Monitor 786b828f33 ngspice: update from 24 to 25 2013-12-23 05:27:10 +02:00
Nixpkgs Monitor 7289affced pari: update from 2.5.4 to 2.5.5 2013-12-21 02:28:25 +02:00
Nixpkgs Monitor b3f1ee3863 jags: update from 2.2.0 to 3.4.0 2013-12-18 18:18:32 +02:00
Nixpkgs Monitor 0aef5b8381 gtkwave: update from 3.3.39 to 3.3.53 2013-12-18 18:18:31 +02:00
Nixpkgs Monitor 24c79d6626 gromacsDouble: update from 4.5.5 to 4.6.5 2013-12-18 18:18:30 +02:00
Nixpkgs Monitor 191f349052 cvc3: update from 2.2 to 2.4.1 2013-12-18 18:18:23 +02:00
Evgeny Egorochkin 69bb44994e avogadro: build documentation 2013-12-18 18:18:22 +02:00
Nixpkgs Monitor de403540ab avogadro: update from 1.0.3 to 1.1.1 2013-12-18 18:18:18 +02:00
Nixpkgs Monitor ac1972d177 archimedes: update from 2.0.0 to 2.0.1 2013-12-15 11:25:56 +02:00
Evgeny Egorochkin 328d59eab6 add meta.repositories.git to several packages 2013-12-10 01:07:30 +02:00
Peter Simons 916af0f39c stellarium: update to version 0.12.4 2013-12-09 12:42:03 +01:00
Nixpkgs Monitor a08f5c4314 verilog: update from 0.9.3 to 0.9.7 2013-12-09 11:30:43 +02:00
Evgeny Egorochkin 1f5d28001e xplanet: fix build against giflib 5.* 2013-12-07 13:13:06 +02:00
Nixpkgs Monitor 6b1a3bffd0 xplanet: update from 1.2.2 to 1.3.0 2013-12-07 13:13:06 +02:00
Michael Raskin 4140dc2628 Updating EKRHuper 2013-11-25 10:59:35 +04:00
Bjørn Forsman c6d548f9b3 spyder: update 2.1.13.1 -> 2.2.5 
This update brings bug fixes and new features.

Full changelog: https://code.google.com/p/spyderlib/source/browse/CHANGELOG
 2013-11-22 23:56:17 +01:00
Karn Kallio 6c32416a31 Fix HOL documentation build 2013-11-16 03:43:38 +02:00
Tom Ridge f13bcf6463 HOL: update to k.8 2013-11-16 02:52:36 +02:00
Bjørn Forsman fd7bc4ebfd kicad: update to latest stable 
The Kicad developers don't make releases, they maintain a stable branch
that is "ready to be released at any moment". Update to latest stable
branch version(s).

The "version number" in the package name attribute is the date of the
last modification to the branch.

Also remove unused inputs: gtk, cups.
 2013-11-15 00:43:17 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Jonas Hoersch 8487fdd209 mathematica: fix x86 build of mathematica 
the MathInstaller doesn't distinguish between 64bit and 32bit linux
platforms.
 2013-11-03 14:01:59 +01:00
Peter Simons cd1605f729 maxima: update to version 5.31.3 2013-11-01 10:53:44 +01:00
Michael Raskin 6944de0f94 Updating EProver to 1.8 2013-10-20 21:03:04 +04:00
Michael Raskin 70f609acbf Updating Ekrhyper 2013-10-20 21:02:37 +04:00
Peter Simons bf3e2d86cb wxmaxima: update to version 13.04.2 2013-10-13 00:39:06 +02:00
Peter Simons 568b39c672 maxima: update to version 5.31.2 2013-10-13 00:37:58 +02:00
Peter Simons 7e06522645 hol: fix access to dot 
Committing on behalf of Karn Kallio <tierpluspluslists@skami.org>.
 2013-10-11 10:20:37 +02:00
Peter Simons 0ae1a8b847 hol: update to version k.8 
Committing on behalf of Tom Ridge <tom.j.ridge@googlemail.com>.
 2013-10-10 12:00:12 +02:00
Eelco Dolstra 2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman 083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman 28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Eelco Dolstra fca11ef500 Fix evaluation errors 2013-10-01 13:12:45 +02:00
Justin Bedo fdc6e4372f Wrapped R's package system similarly to perlPackages 2013-09-28 13:19:43 +02:00
Alexander Kahl 6371fd0908 speedcrunch: new package 
speedcrunch is a fast power user calculator.
 2013-09-27 00:58:54 +02:00
Peter Simons 90f9726fa7 pspp: add version 0.8.1 2013-09-26 11:53:38 +02:00
Peter Simons 97bb401d8d R: update to 3.0.2 2013-09-25 16:40:55 +02:00
Justin Bedo c38ffa7b7d Added expression for PLINK 2013-09-19 09:39:14 +10:00
Peter Simons ab3b1a5aa9 gravit: enable PNG support 2013-09-17 11:53:27 +02:00
Peter Simons babbfd4d2c gravit: this package can be built with any 5.x version of lua 2013-09-17 11:47:25 +02:00
Jonas Hoersch 986b34580d add mathematica version 9.0.0 
Wolfram Mathematica based on the makeself archive found on the Mathematica installation DVD.
 2013-09-15 18:33:13 +02:00
Jason \"Don\" O'Conal f3802002c3 ginac: fix build on darwin (close #944) 2013-09-08 11:01:48 +02:00
Gergely Risko b43347342b Add platforms to coq, so it's built on Hydra 2013-08-28 21:35:07 +02:00
Peter Simons dc5843399d maxima: add $out/bin to $PATH in the maxima wrapper scripts 
This ensures that Maxima's wrapper scripts (such as rmaxima) find the
correct maxima binary.
 2013-08-28 16:33:53 +02:00
Peter Simons 5fc7590886 maxima: update to version 5.30.0 2013-08-28 16:33:53 +02:00
Bjørn Forsman efcffe61e4 eagle: bump version 6.4.0 -> 6.5.0 
And name the desktop file "eagle.desktop", not "Eagle.desktop". The user
facing application name is still "Eagle"; it has nothing to do with the
name of the desktop file.
 2013-08-25 20:42:51 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 0237aa136f R: ensure that run-time dependencies can be found 2013-08-06 00:44:20 +02:00
Ertugrul Söylemez 2519a86942 pari: Updated to 2.5.4, fixed GMP and readline support. 2013-07-19 19:52:11 +02:00
Evgeny Egorochkin 74491ea24b boinc: fix url 2013-07-19 08:25:00 +03:00
Evgeny Egorochkin d26e46acd6 golly: fix version to match tarball. this time for sure :) 2013-07-18 03:55:56 +03:00
Russell O'Connor 3538f7c549 Update download link for ssreflect. 2013-07-14 23:41:55 -04:00
Evgeny Egorochkin d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin 5ae43d2494 Change more packages from direct downloads to mirror://sourceforge 2013-07-14 02:48:32 +03:00
Evgeny Egorochkin 0f99aace03 ssreflect: fix url 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin 33dac78323 golly: fix version to match tarball 2013-07-14 02:08:49 +03:00
Vladimír Čunát 4a0952d2fa fix bad "licence" names 
Mostly what I merged from @lovek323.
Such errors can be easily checked by
  nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
 2013-07-04 18:16:34 +02:00
Peter Simons 9185515611 R: add various features 
* Ensure that R can link blas, liblapack, and libgfortran at run-time.
 * Ensure that R can run the Tcl/Tk interpreter.
 * Add Java support.
 * Install texinfo and PDF documentation.
 2013-07-04 13:42:47 +02:00
Mathijs Kwik 0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Lluís Batlle i Rossell 4c6a981070 Adding 'weka'. 2013-06-19 16:19:06 +02:00
Evgeny Egorochkin 6b4eaf71fe Merge pull request #636 from craff/glsurf 
Glsurf (3D drawing of implicit surfaces and curves)
 2013-06-18 22:34:08 -07:00
Christophe Raffalli 102216f8c9 Drop useless dependencies in glsurf 2013-06-19 05:03:42 +02:00
Peter Simons e006c2fd49 celestia: fix compilation and linking after x-updates merge 2013-06-18 13:11:03 +02:00
Peter Simons efac6d8e73 celestia: help the package find the gtk related libraries 2013-06-18 12:44:24 +02:00
Peter Simons 3e241c3f83 celestia: add patch to support libpng 1.6 2013-06-18 12:44:24 +02:00
Peter Simons e6c48a73f8 celestia: update hashes for the downloaded patches 2013-06-18 12:44:23 +02:00
Christophe Raffalli cb980d97d7 added glsurf package 2013-06-16 22:33:47 +02:00
Michael Raskin 81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Russell O'Connor c9f5959285 Update Coq to version 8.4pl2. 2013-06-14 12:16:52 -04:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Bjørn Forsman a31ba7ed65 eagle: new package 
Eagle is a schematic capture and PCB layout program from CadSoft. This
is proprietary software; CadSoft provide a self-extracting shell script
with embedded tarball of the prebuilt application.

Add the latest Eagle version, 6.4.0.

I've added a small LD_PRELOAD library that redirects operations on the
license file from <eagle_install_path>/bin/eagle.key to
$HOME/.eagle.key. Without this Eagle will never get past the license
dialog (because you cannot write to the nix store).

Eagle also has issues copying its example projects to other locations;
it seems that it wants to preserve the read-only permissions from the
source over to the destination. Because of this it cannot complete the
copy operation because it cannot write the project files into to the
(read-only) project directory it just created. So wrap chmod by OR'ing
in the write-by-owner bit.
 2013-05-25 21:12:47 +02:00
Peter Simons 5779dfc8e4 R: add version 3.0.1 2013-05-23 11:35:59 +02:00
Peter Simons 398e4a15b0 stellarium: update to version 0.12.1 2013-05-22 11:42:45 +02:00
Peter Simons b72a91b6a5 wxmaxima: update to version 13.04.1 2013-05-22 11:21:55 +02:00
Rob Vermaas d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Michael Raskin 9d92fe013e Adding E-KRHyper theorem prover 2013-05-09 17:47:58 +04:00
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