Add ZNC module. Has zncConfOptions or specify full conf file.
Merge remote-tracking branch 'nixos/master' into feature/add-znc-module

Conflicts:
	nixos/modules/misc/ids.nix
dfeet: fix icons
gnome-music 3.12: add totem-pl-parser to dependencies
Packaging plasma-nm and its dependencies
openocd: fix symlink to udev rules file

I made an error last time I touched this line. Fix it (.udev => .rules).
Fix nixpkgs evaluation

'banshee' doesn't exist (yet) in nixpkgs. I think it was accidentally
added in commit 5dc9730a63f2dc1c18e56a3a81060684bd848cf0 (gnome-music
3.12: add totem-pl-parser to dependencies).
Merge pull request #3186 from geerds/plasma-nm

Packaging plasma-nm and its dependencies
Revert "nodePackages.couchapp: added & and node packages updated"

This reverts commit 8cf2cd5d1163c20c74c0d0a7e535f3d0a7717093.
Revert "haskell-gtkglext: update to version 0.12.5.0"

Because it breaks nixpkgs evaluation:

$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named `haskell-gtkglext-ghc7.6.3-0.12.5.0':
while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `haskell-gtkglext-ghc7.6.3-0.12.5.0' at /home/bfo/nixpkgs/pkgs/build-support/cabal/default.nix:70:13:
infinite recursion encountered

This reverts commit 6ba32aa8bdfd73b6b55d07f270a3f344007ab7cb.
gnome-shell: enable parallel building
evolution-data-server: wrap all libexec executables
Add gnome shell extensions plugin for browsers
watchman: new package

This adds `watchman`, a CLI utility that watches files and takes action when
they change.
Merge pull request #2582 from chexxor/feature/add-znc-module

Add ZNC module
Merge remote-tracking branch 'upstream/master'
empathy: fix icons
telepathy-gabble: build on hydra
Merge pull request #3190 from cstrahan/watchman

watchman: new package
Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2 added. Low/High-level API for git