power-management: Don't enable acpid.
Running acpid along with systemd will cause double handling of acpi events.
Revert "Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs"

nix-run's functionality is subsumed by nix-shell -p.

This reverts commit 3cc2b243c7f2d906ce77968e75fd84a3f65a09e0, reversing
changes made to 4d5d6aed29a0ee10a471fd870fa2fdb61408e4eb.
liferea: fix crash when opening file dialogs

The same schema issue as always in gtk3 dialogs.
Add haskell library terminal-size.
Merge branch 'patch-1' of git://github.com/msackman/nixpkgs

Update serfdom to 0.5.0
Merge branch 'vmpk' of git://github.com/iyzsong/nixpkgs

add vmpk 0.5.1, a virtual midi piano keyboard
nixos/gpsd-service: change from deprecated 'jobs' type to 'systemd'

This has the nice side-effect of making gpsd actually run!

Old behaviour (debugLevel=2):

  systemd[1]: gpsd.service holdoff time over, scheduling restart.
  systemd[1]: Stopping GPSD daemon...
  systemd[1]: Starting GPSD daemon...
  systemd[1]: gpsd.service start request repeated too quickly, refusing to start.
  systemd[1]: Failed to start GPSD daemon.
  systemd[1]: Unit gpsd.service entered failed state.

New behaviour (debugLevel=2):

  gpsd[945]: gpsd: launching (Version 2.95)
  systemd[1]: Started GPSD daemon.
  gpsd[945]: gpsd: listening on port 2947
  gpsd[945]: gpsd: running with effective group ID 27
  gpsd[945]: gpsd: running with effective user ID 23
  gpsd[945]: gpsd: stashing device /dev/ttyUSB0 at slot 0
nixos/gpsd-service: add type declarations to options
gpsd: update 2.95 -> 3.10

Build system is changed, gpsd uses scons now.

The expressions needs some more work, TODO comments added. (xgps didn't
work before this change either.)

I added an option for the gpsd group, which is set to upstream default:
"dialout". Note that our default gpsd user is "gpsd", while upstream
uses "nobody" by default.
gpsd: update meta attributes

* Don't repeat package name in description
* longDescription re-copied from homepage (gpsd now supports AIS...)
* The homepage has moved
* Add platforms and maintainers
Merge branch 'master.ccid' of git://github.com/wkennington/nixpkgs

ccid: Update from 1.4.14 -> 1.4.15
grsecurity: Fix grsec-path.patch to apply with newest patches
Merge branch 'coq' of git://github.com/thoughtpolice/nixpkgs

coq: 8.4pl2 -> 8.4pl3
Merge branch 'ocaml-extlib' of git://github.com/maggesi/nixpkgs

Update OCaml ExtLib to version 1.6.1
Merge branch 'zsh' of git://github.com/ttuegel/nixpkgs

zsh: don't clobber the environment of non-login shells
Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs

Ocaml oasis
Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs

Bump wqy-zenhei font to the latest version and add wqy-microhei
Merge branch 'master.rpm' of git://github.com/wkennington/nixpkgs

rpm: Upgrade from 4.7.2 -> 4.11.2
Merge branch 'postgresql-user' of git://github.com/ocharles/nixpkgs

postgresql module: Use the default superuser username
Update KTorrent to 4.3.1.