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
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
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
Mathijs Kwik
4d19da7e99
gtk-2: remove unneeded argument
2013-06-14 13:49:35 +02:00
Eelco Dolstra
672ae93687
jquery-ui: Update to 1.10.3
...
Also add a symlink jquery.js (jquery.min.js is gone).
2013-06-14 13:38:37 +02:00
Eelco Dolstra
a0c5ff6571
nixUnstable: Update to 1.5.3pre3141_1b6ee8f
2013-06-14 13:38:36 +02:00
Gergely Risko
fab2610bcf
Add vectorThUnbox
2013-06-14 13:09:11 +02:00
Gergely Risko
4d49435cf6
Add template-default
2013-06-14 13:04:40 +02:00
Gergely Risko
89f28c9923
Add hit and (it's dependency,) bytedump
2013-06-14 11:57:24 +02:00
Gergely Risko
efb46727cb
Add haskell/xtest
2013-06-14 11:35:52 +02:00
Jason "Don" O'Conal
d0d9470519
sup: add required gems and separate dependencies
2013-06-14 18:06:14 +10:00
Michael Raskin
7093dd2c70
Some fixes
2013-06-14 07:46:33 +04:00
Lluís Batlle i Rossell
7346eb64bf
Adding comment about psmouse-alps.
2013-06-13 23:25:52 +02:00
Michael Raskin
1a41887398
Fix a missing option declaration after merge
2013-06-14 00:11:34 +04:00
Michael Raskin
605c5a55a8
Merge branch 'x-updates-failed-merge-2013-06-13' into x-updates
2013-06-14 00:10:35 +04:00
Vladimír Čunát
94d8de2b99
dbus: fix build on non-Linux platforms
...
We do not want systemd there.
This should fix the tarball job systemd assertion problems.
2013-06-13 21:02:00 +02:00
Vladimír Čunát
84bf7818a4
dbus: minor update, fixing DOS CVE-2013-2168
...
I tried building some X apps, all seems fine.
2013-06-13 20:57:41 +02:00