haskell-diagrams-contrib: update to version 1.1.1.4
haskell-diagrams-lib: update to version 1.1.0.6
haskell-diagrams-postscript: update to version 1.0.2.4
nvidia-x11: patch for kernel 3.14 support
Fix initrd breaking by recent repeatable-builds changes

See the comments at https://github.com/NixOS/nixpkgs/commit/f67015cae49400eba539b9ec8b9920643581c77c
for more information.

Please note: this makes initrd unrepeatable again, but most people will prefer that above an unbootable system.
Revert "Use PostgreSQL 9.3's `pg_isready` to wait for connectivity"

Reverting postgres superuser changes until after stable.

This reverts commit e2066841106a6b89093ab685368742efa4e3c2c1.
Revert "Create the 'postgres' superuser"

Reverting postgres superuser changes until after stable.

This reverts commit 7de29bd26f5e514e95d5d261c08f3029337eecb3.
Revert "postgresql: properly fix permissions issue by in postStart"

Reverting postgres superuser changes until after stable.

This reverts commit c66be6378d8bbcea271b2d2102741fdda87ec8fe.
Revert "Merge branch 'postgresql-user' of git://github.com/ocharles/nixpkgs"

Reverting postgres superuser changes until after stable.

This reverts commit 6cc0cc7ff6136963acb32b5107696484b6220562, reversing
changes made to 3c4be425dbe2d5a00f2923210a86ce7e7a4c516f.
Merge branch 'revert-postgres-superuser'

The recent postgres superuser changes have caused a lot of breakages to
existing systems, and we are very close to branching for the 14.04
stable release. We can bring this back after.
p0f: build fix attempt for Hydra

Signed-off-by: Austin Seipp <aseipp@pobox.com>
spiped: attempt to fix linux Hydra build

Signed-off-by: Austin Seipp <aseipp@pobox.com>
libseccomp: attempt to fix Hydra build

Signed-off-by: Austin Seipp <aseipp@pobox.com>
capstone: attempt to fix Linux build, remove Darwin build

The Darwin build seems fixable but I can't test right now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
nixos: add grsecurity module (#1875)

This module implements a significant refactoring in grsecurity
configuration for NixOS, making it far more usable by default and much
easier to configure.

 - New security.grsecurity NixOS attributes.
   - All grsec kernels supported
   - Allows default 'auto' grsec configuration, or custom config
   - Supports custom kernel options through kernelExtraConfig
   - Defaults to high-security - user must choose kernel, server/desktop
     mode, and any virtualisation software. That's all.
   - kptr_restrict is fixed under grsecurity (it's unwriteable)
 - grsecurity patch creation is now significantly abstracted
   - only need revision, version, and SHA1
   - kernel version requirements are asserted for sanity
   - built kernels can have the uname specify the exact grsec version
     for development or bug reports. Off by default (requires
     `security.grsecurity.config.verboseVersion = true;`)
 - grsecurity sysctl support
   - By default, disabled.
   - For people who enable it, NixOS deploys a 'grsec-lock' systemd
     service which runs at startup. You are expected to configure sysctl
     through NixOS like you regularly would, which will occur before the
     service is started. As a result, changing sysctl settings requires
     a reboot.
 - New default group: 'grsecurity'
   - Root is a member by default
   - GRKERNSEC_PROC_GID is implicitly set to the 'grsecurity' GID,
     making it possible to easily add users to this group for /proc
     access
 - AppArmor is now automatically enabled where it wasn't before, despite
   implying features.apparmor = true

The most trivial example of enabling grsecurity in your kernel is by
specifying:

    security.grsecurity.enable          = true;
    security.grsecurity.testing         = true;      # testing 3.13 kernel
    security.grsecurity.config.system   = "desktop"; # or "server"

This specifies absolutely no virtualisation support. In general, you
probably at least want KVM host support, which is a little more work.
So:

    security.grsecurity.enable = true;
    security.grsecurity.stable = true; # enable stable 3.2 kernel
    security.grsecurity.config = {
      system   = "server";
      priority = "security";
      virtualisationConfig   = "host";
      virtualisationSoftware = "kvm";
      hardwareVirtualisation = true;
    }

This module has primarily been tested on Hetzner EX40 & VQ7 servers
using NixOps.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
clang_34: make it evaluate to 3.4 even on Darwin
drumkv1: update from 0.4.0 to 0.4.1
samplv1: update from 0.4.0 to 0.4.1
synthv1: update from 0.4.0 to 0.4.1
oxygen_gtk: update from 1.4.4 to 1.4.5