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
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
2735e9c8d6
apacheHttpd: fix build on darwin
...
* remove the gcc_s library from NIX_LDFLAGS (not available on darwin)
2013-06-14 18:16:37 +10: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
Vladimír Čunát
fa6caedfea
qt48: hopefully a version that works for all possibilities
...
All builds were OK on my 8-thread testing machine, but it's probably too
little parallelism to show these problems.
2013-06-13 19:18:34 +02:00
Eelco Dolstra
197b166f0c
Update some Perl packages
2013-06-13 15:56:23 +02:00
Eelco Dolstra
629daa2102
Rewrite the CPAN generator to Perl
...
Also:
- It's now installable by doing "nix-env -i nix-generate-from-cpan".
- It maps dependencies to the correct attribute (e.g. HTML::HeadParser
is mapped to HTMLParser).
- It automatically selects buildPerlPackage or buildPerlModule.
- It's documented in the manual.
2013-06-13 15:56:23 +02:00
Eelco Dolstra
a79076b7aa
Consistent whitespace
2013-06-13 15:56:23 +02:00
Eelco Dolstra
de1c72f686
buildPerlModule: Call "./Build build"
...
Some modules require this.
2013-06-13 15:56:23 +02:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin
8fe0f0007b
Merge pull request #618 from orbitz/add-riak-1.3.1-fix-rebar-shebang
...
Fixes rebar shebang, also fixes source of leveldb zip to be the canonica...
2013-06-13 05:49:03 -07:00
Malcolm Matalka
ebaf0c01d3
Fixes rebar shebang, also fixes source of leveldb zip to be the canonical one from github
2013-06-13 14:45:41 +02:00
Michael Raskin
ed51d54610
Merge pull request #606 from fignuts/master
...
Add keepass password manager and update mono DLLMap.
2013-06-13 05:42:53 -07:00
Michael Raskin
27bbff463f
Merge pull request #601 from craff/ocaml/upgrade_and_new
...
Ocaml/upgrade and new
2013-06-13 05:41:59 -07:00
Michael Raskin
c7536d2fa6
Merge pull request #617 from lovek323/vim_configurable
...
Get vim_configurable compiling on darwin
2013-06-13 05:41:12 -07:00
Jason "Don" O'Conal
2956b5db46
sdcv: add expression
2013-06-13 22:33:52 +10:00
Jason "Don" O'Conal
6baad4d4d6
vim_configurable: fix compilation on darwin
...
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
2013-06-13 22:20:54 +10:00
Sander van der Burg
e5c7533b6c
titaniumsdk: Bump to version 3.1.1
2013-06-13 13:58:32 +02:00
Vladimír Čunát
ca67fccbfe
pyGtkGlade: fix eval
...
I didn't expect the file to be imported on two places.
2013-06-13 13:12:39 +02:00