Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-file' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (546 commits)
  update linux 3.2.45
  Fixing 'my-env', when without cleanup.
  Some kde wrapper improvements.
  update gnuplot to 4.6.0
  hipchat: Fix desktop item
  nvidia-x11: Update to 319.17
  git: Update to 1.8.2.3
  mysql: Update to 5.1.69
  mysql: Update to 5.5.31
  scala: Remove scalacheck.jar from scala's classpath
  jayschema: JSON schema validator NodeJS package
  haskell-irc: no longer depends on parsec-2.
  go: 1.1 released
  nix: Update to 1.5.2
  Doh
  dunst: upgrade, set maintainers, set default config file
  Download git-annex from github instead of git.kitenet.net
  Restore unintentionally deleted line
  Use Linux 3.9 for VM builds
  Fix some old Fedora builds
  ...

Conflicts:
	pkgs/lib/misc.nix
Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-file' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (65 commits)
  lilypond: Update to 2.16.2, fix guile.
  haskell: Add alsa-core, alsa-pcm, ix-shapable, carray and sample-frame.
  Add perl Text::BibTeX, along with Config::AutoConf and ExtUtils::LibBuilder.
  Add "arbtt" along with its Haskell dependencies.
  dictd-wiktionary: Let dictd serve an offline copy of wiktionary.
  dictd-wordnet: Make wordnet available via local dictd.
  Add monkey's audio (.ape) lossless encoder/decoder.
  curl: Optionally add support for GSSAPI (Kerberos).
  glew: update
  mosh: update to 1.2.4
  libssh2: update (merge #510)
  add parcellite-1.1.4
  zsync: update to 0.6.2
  Revert "gnutls: update to 3.2.0"
  gnutls: update to 3.2.0
  fox: setting the newer libpng
  Updating xfe (1.34) and fox (1.6.48)
  thunderbird: Update to 17.0.6
  php: Update to 5.3.25, 5.4.15
  nss_ldap: fixing crash with glibc >= 2.16
  ...
haskell-uu-options: update to version 0.1.0.1
release-haskell.nix: test-build alsa-core and alsa-pcm libraries
Re-generate Haskell expressions with Hackage4Nix.
freepats: new package

freepats is a project to create a free and open set of instrument
patches, in any format, that can be used with softsynths.

I'm adding it because it is needed for WildMIDI, which is needed for
MIDI support in Qmmp (audio player). I'll add WildMIDI and Qmmp in the
next commit(s).
wildmidi: new package

WildMIDI is a simple software midi player which has a core softsynth
library that can be use with other applications.

I have tested the wildmidi executable with a MIDI file. It works.
qmmp: new package

Qmmp is a Qt-based audio player that look like Winamp.
ninja: include package name in source archive path

So that the nix store path becomes this:

  /nix/store/HASH-ninja-1.2.0.zip.drv

instead of this anonymous path:

  /nix/store/HASH-v1.2.0.zip.drv
KDE 4.10: bugfix release 4.10.3
Merge pull request #544 from bjornfor/ninja

ninja: include package name in source archive path
Merge pull request #543 from bjornfor/qmmp

Add Qmmp audio player (plus dependencies)
Merge remote-tracking branch 'refs/remotes/gh/experimental/multiple-versions-in-one-file' into HEAD

* refs/remotes/gh/experimental/multiple-versions-in-one-file:
  improve documentation
  set name by default
  comments
  documentation
  new tg branch experimental/multiple-versions-in-one-file
Merge commit '4667f3da731d444e9443cbc36c470693ae7ec7ed' into experimental/multiple-versions-in-one-file

* commit '4667f3da731d444e9443cbc36c470693ae7ec7ed':
  KDE 4.10: bugfix release 4.10.3
  ninja: include package name in source archive path
  qmmp: new package
  wildmidi: new package
  freepats: new package
  Re-generate Haskell expressions with Hackage4Nix.
  release-haskell.nix: test-build alsa-core and alsa-pcm libraries
  haskell-uu-options: update to version 0.1.0.1