Commit graph

27182 commits

Author SHA1 Message Date
Vladimír Čunát
afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Vladimír Čunát
0f7e530c9d mesa_noglu: make it meaningful even on darwin
In future we should change the mess, e.g. have libGL, libGLU and similar
attributes.
2013-06-17 16:14:46 +02:00
Jason \"Don\" O'Conal
8ce7550a9f cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
Vladimír Čunát
cba6d9b11a qt48: I give up, switching off parallel building
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
2013-06-17 10:06:23 +02:00
Vladimír Čunát
c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Rob Vermaas
ccda14879e Add unionfs-fuse and ntfs-3g to the channel 2013-06-15 20:47:47 +02:00
Domen Kožar
1be45ef6c4 Merge pull request #632 from lovek323/vim-syntastic
Add vim syntastic plugin
2013-06-15 10:45:45 -07:00
Domen Kožar
0d15be335c Merge pull request #629 from lovek323/vim_configurable
vim_configurable: improvements
2013-06-15 10:36:51 -07:00
Rob Vermaas
88edaa3da8 Merge pull request #634 from aristidb/master
Linux 3.9.6
2013-06-15 10:35:39 -07:00
Aristid Breitkreuz
c63f00c337 linux 3.9.6 2013-06-15 19:32:20 +02:00
Peter Simons
84c1d5f03b all-packages.nix: use blanks instead of tabs 2013-06-15 17:14:57 +02:00
Peter Simons
38d22b4851 ess: add Emacs Speaks Statistics mode 2013-06-15 17:13:37 +02:00
Michael Raskin
81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Mathijs Kwik
1f4c079bc3 Re-propagate libdrm 2013-06-15 17:15:07 +04:00
Peter Simons
43822c1a36 haskell-cabal2nix: update to version 1.52 2013-06-15 13:40:59 +02:00
Peter Simons
9ce5dec479 cosmetic 2013-06-15 13:40:59 +02:00
Peter Simons
362a77ad85 Merge pull request #630 from lovek323/sup
sup: add missing dependencies
2013-06-15 04:27:37 -07:00
Peter Simons
5a1e9a9cf2 haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4 2013-06-15 13:18:51 +02:00
Jason "Don" O'Conal
d166efdff5 sup: add missing dependencies
* rubygems `locale` and `text` were missing from the sup expression
2013-06-15 21:03:01 +10:00
Peter Simons
b7cba63031 Add moderntimeline extension for moderncv. 2013-06-15 13:00:02 +02:00
Peter Simons
9df1684126 moderncv: update to version 1.5.1 2013-06-15 13:00:02 +02:00
Jason "Don" O'Conal
b7b98f04a2 vim_configurable: improvements
* add ruby interpreter (may have been accidentally removed, or may never
  have existed)
* allow selection of GUI options by setting `config.vim.gui`
2013-06-15 20:48:20 +10:00
Peter Simons
0ec9ca98a9 haskell-shake: update to version 0.10.5 2013-06-15 12:39:16 +02:00
Peter Simons
67fc03f1e4 haskell-accelerate: update to version 0.13.0.5 2013-06-15 12:39:16 +02:00
Peter Simons
41b4c3da48 haskell-accelerate-io: update to version 0.13.0.2 2013-06-15 12:39:16 +02:00
Peter Simons
ad8413ac0b haskell-accelerate-cuda: update to version 0.13.0.3 2013-06-15 12:39:16 +02:00
Peter Simons
9c771de1a8 Agda: drop redundant overrides 2013-06-15 12:39:16 +02:00
Peter Simons
0f25c404bc haskell-hashable: add version 1.2.0.10 2013-06-15 12:39:15 +02:00
Peter Simons
c0d78bf9a6 Merge pull request #621 from errge/xtest
Add haskell/xtest
2013-06-15 03:37:39 -07:00
Peter Simons
c7ee3ca11c Merge pull request #622 from errge/hit
Add hit and (it's dependency,) bytedump
2013-06-15 03:37:12 -07:00
Peter Simons
c9192f5ed5 Merge pull request #624 from errge/template-default
Add template-default
2013-06-15 03:36:42 -07:00
Peter Simons
4399352078 Merge pull request #625 from errge/vector
Add vectorThUnbox
2013-06-15 03:34:13 -07:00
Peter Simons
fc165c0db9 Merge pull request #626 from lovek323/sup
sup: add required gems and separate dependencies
2013-06-15 03:26:10 -07:00
Peter Simons
bc73915b72 Merge pull request #628 from craff/pgf-tikz/update
Pgf tikz/update
2013-06-15 03:22:16 -07:00
Peter Simons
12c9251a3d haskell-defaults.nix: add overrides to fix the latest cabal-install build with older GHC versions 2013-06-15 12:12:08 +02:00
Peter Simons
7d67e76664 release-haskell.nix: build the latest version of Cabal and cabal-install with all GHC major releases 2013-06-15 12:01:19 +02:00
Peter Simons
e049b5b972 gnucash: update to version 2.4.13 2013-06-15 11:53:13 +02:00
Christophe Raffalli
ec41f1928a fix pgf hash 2013-06-15 07:07:26 +00:00
Christophe Raffalli
f53c60c8bb upgrading pgf/tikz to 2.10 2013-06-15 06:57:06 +00:00
Jason "Don" O'Conal
4968acde6b Add vim syntastic plugin 2013-06-15 13:22:11 +10:00
Russell O'Connor
74d7c12e3a Merge branch 'master' of github.com:NixOS/nixpkgs 2013-06-14 12:18:27 -04:00
Russell O'Connor
c9f5959285 Update Coq to version 8.4pl2. 2013-06-14 12:16:52 -04:00
aszlig
cfb697b013
chromium: Update beta and dev release channels.
The following new versions were introduced:

beta: 28.0.1500.45 - builds fine and tested
dev:  29.0.1521.3  - builds fine and tested

Although the version from the dev release channel isn't the latest found on
omahaproxy but it's the latest one, that actually has tarballs available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:37 +02:00
aszlig
777351bce4
chromium/updater: Avoid downgrading versions.
Previously we have just checked for equality. When going back in history, that
way if the history is somewhat out-of-sync, we could end up "updating" to an
older version, which we definitely don't want.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:36 +02:00
aszlig
872fb3e2ff
chromium/updater: Fetch more previous versions.
Omahaproxy has an URL which lists a history of the published versions, which
allows to not only go back one versions, but several. Now it is ensured, that we
always have the latest _available_ version in sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:36 +02:00
aszlig
5a6242a401
chromium/updater: Fall back to previous version.
This is especially annoying for the dev channel, as it happens quite frequently
that tarballs are unavailable. So if fetching the latest version doesn't work,
try the second latest version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:36 +02:00
aszlig
8cf68e5645
chromium/updater: Remove workaround for <= v26.
We no longer need the tar.bz2 archives, so let's remove the switch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:35 +02:00
aszlig
ea87598a71
zabbix20: Update to version 2.0.6.
Release notes for this version and 2.0.5:

http://www.zabbix.com/rn2.0.6.php
http://www.zabbix.com/rn2.0.5.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:35 +02:00
aszlig
486e918215
php: Fix support for JPEG and PNG over GD.
Set an explicit path to the location of libjpeg for version 5.4 and an explicit
path to libjpeg _and_ libpng for version 5.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:35 +02:00
Eelco Dolstra
935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +02:00