Commit Graph

353 Commits

Author SHA1 Message Date
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