Haskell: add monadloc-pp
Update povray.
Current master version has 404 on tar.gz.
smljnBootstrap: new expression for running smlnj on darwin
twelf: new expression; prover for PL theory and logic
Merge pull request #3094 from vandenoever/povray

Update povray.
Merge pull request #3086 from tomberek/haskell_addmonadlocpp

Haskell: add monadloc-pp
php: 5.4.29 -> 5.4.30

CVE-2014-3981, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479,
CVE-2014-3480, CVE-2014-3487, CVE-2014-4049, CVE-2014-3515

Signed-off-by: Austin Seipp <aseipp@pobox.com>
kernel/grsec: updates

Signed-off-by: Austin Seipp <aseipp@pobox.com>
haskell-ghc-mod: patch ghc-process.el to avoid hanging

@peti I've determined that the hang which this fixes does not happen all
of the time (in fact, I've been using ghc-mod for weeks without seeing
it once).  But today it happened again, and it made me realize I had
undone this patch locally.  I'm committing it now because it fixes the
problem completely for me, and certainly cannot hurt.
arcanist: 20140617 -> 20140627

Signed-off-by: Austin Seipp <aseipp@pobox.com>
nixos/tests/openssh: Test configured auth keys.

So far the test only uses an authorized key that is copied over to the
target machine instead of being set by the target's configuration.

Now, we cover both cases.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Revert "nixos/sshd: drop mode from auth keys file".

This reverts commit a3331eb87b25d954766af9652e1415a783dae76c.

See https://github.com/NixOS/nixpkgs/issues/2559#issuecomment-47313334
for a description why this is not a good idea.

I guess it's better to implement a sane way to remove all files in
authorized_keys.d, especially because it is also backwards-compatible.

Reopens #2559.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
nixos/log2html: Remove schema from jQuery URLs.

This allows viewing test logs for example when using a Hydra running
with HTTPS.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
licenses: add attribute "free" to fix eval of smlnjBootstrap
Fix network-manager-applet startup issue 'GLib-GIO-Message: Using the 'memory' GSettings backend.  Your settings will not be saved or shared with other applications.'

(cherry picked from commit 51dc1ddb7c6e974e36c1a2d8701fbc7c254cbc72)

Conflicts:
	pkgs/tools/networking/network-manager-applet/default.nix
transcode: new package

Suite of command line utilities for transcoding video and audio codecs,
and for converting beween different container formats.

http://www.transcoding.org/
Merge pull request #3052 with some additional changes
Allow selection of named SF dirs
Adding libatomic_ops
Adding librevenge: a library for creating file importers