add haskell-tree-view-0.4
add haskell-syntactic-1.11
Merge branch 'reserve-ids' of git://github.com/thoughtpolice/nixpkgs

nixos: reserve some uids/gids (#2109)
Allow undefined uids and gids when mutableUsers = true

Groups and users without gid/uid are created with
useradd/groupadd after the passwd/group merge phase
if mutableUsers = true.

This should fix #2114.
Merge branch 'pastebinit' of git://github.com/lethalman/nixpkgs

pastebinit: new package
Create the 'postgres' superuser

Old PostgreSQL installations were created using the 'root' database
user. In this case, we need to create a new 'postgres' account, as we
now assume that this is the superuser account.

Unfortunately, these machines will be left with a 'root' user as
well (which will have ownership of some databases). While PostgreSQL
does let you rename superuser accounts, you can only do that when you
are connected as a *different* database user. Thus we'd have to create a
special superuser account to do the renaming. As we default to using
ident authentication, we would have to create a system level user to do
this. This all feels rather complex, so I'm currently opting to keep the
'root' user on these old machines.
Use PostgreSQL 9.3's `pg_isready` to wait for connectivity

The postgresql module has a postStart section that waits for a database
to accept connections before continuing. However, this assumes various
properties about the database - specifically the database user
and (implicitly) the database name. This means that for old
installations, this command fails because there is no 'postgres' user,
and the service never starts.

While 7deff39 does create the 'postgres' user, a better solution is to
use `pg_isready`, who's sole purpose is to check if the database is
accepting connections. This has no dependency on users, so should be
more robust.
Merge pull request #2139 from lethalman/gnome3

Fix gsettings schemas usage for several packages due to #1901
gnome-backgrounds: new package
gnome-dictionary: new package

Dictionary is the GNOME application to look up definitions

https://wiki.gnome.org/Apps/Dictionary
totem-pl-parser: new package

Simple GObject-based library to parse and save a host of playlist formats

https://wiki.gnome.org/Apps/Videos
grilo: new package

Framework that provides access to various sources of multimedia content, using a pluggable system

https://wiki.gnome.org/action/show/Projects/Grilo
totem: new package

Movie player for the GNOME desktop based on GStreamer

https://wiki.gnome.org/Apps/Videos
gnome-disk-utility: remove duplicated preFixup attribute
Add sproxy
Add sproxy-web
spiped: version 1.3.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Merge pull request #2148 from lethalman/gnome3-packages

add gnome3 backgrounds, dictionary, grilo, totem

also fix evaluation
Merge pull request #2149 from thoughtpolice/spiped

spiped: version 1.3.1
gnome-system-log: remove duplicated preFixup attribute