new tg branch experimental/urweb
prepare it
new tg branch experimental/multiple-versions-in-one-file
documentation
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': (319 commits)
  Adding the gcc47 attribute, pointing to gcc47_real, for the attributes to look like the gcc46 case.
  Adding gcc 4.7.1.
  linux/manual-config.nix: When stripping, use xargs -r in case CONFIG_MODULES=y but no modules are actually installed
  linux/manual-config: Use kernelPatches like generic.nix, not a plain patches list
  kernelPackages.splashUtils: Enable detecting if manually configured kernels have fbcondecor
  linux/manual-config: Install the kernel with the name given in stdenv.platform.kernelTarget
  grub2: Add dependency on devicemapper (needed for LVM support)
  linux/manual-config: When installing firmware, create the firmware directory prior to make *_install.
  linux/manual-config: Remove unnecessary quotation
  linux/kernel/manual-config: use isDisabled instead of isNo in case FIRMWARE_IN_KERNEL is left unspecified
  linux/manual-config: Change from 'features' to 'config' and fix build when firmware is installed.
  Add sbc
  networkmanagerapplet: Update to 0.9.4.1
  gnomeicontheme: Update to 3.4.0
  networkmanager: Add me as maintainer
  django: Rename django_1_3_2 to django_1_3.
  Add some packages to the channel
  django: Security update to 1.3.2 and 1.4.1.
  Fix w3m configure problem on non-chroot build env.
  Joe: Bump to 3.7
  ...
NetworkManager-pptp: fix path to pppd and pptp, upgrade
Revert "xen: update to version 4.1.2"

This reverts commit af32fd6ce3ce2ae138c2fc2bc5c6067216f8b828.
Bump gitAndTools/tig from 0.16 to 1.0
xen: Support PCI passthrough.

Previous commit reverted Xen back to 4.0.3 because xend from 4.1.* and newer
hangs for unknown reasons.
The new "xl" toolstack from 4.1.* and unstable works, yet PCI passthrough is not
supported by xl in 4.1.* and is broken in the unstable.

With this patch I was able to passthrough ATI Radeon HD 6950 without 3D
acceleration, though, to both Linux and Windows guests. Which is the best
archived result with Xen PCI passthrough on NixOS after trying out all possible
Xen versions.
Same VGA card works fine if passed through into a guest with KVM (acceleration,
GPGPU, everything works). I should have tried KVM from the start.
Add package enca 1.13 to tools/text
pptp: Fix path to `ip`

routing.c has hardcoded /bin/ip. Use ${iproute2}/sbin/ip instead.
KDE NM 0.9.0.4
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': (77 commits)
  chromium: Install libffmpegsumo.so.
  Scribus minor update, modifying dependencies.
  Hunspell upgrade.
  LyX: add support for spell checking via enchant.
  linux/manual-config: Fix depmod step, remove false comment
  xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
  Add xvfb-run, a wrapper script for Xvfb.
  Add selenium python package
  git: Update to 1.7.11.4
  awesome: update to 3.4.13
  linux: Update to 3.2.26
  django: Fix URL in src.
  haskell-shelly: update to version 0.14.0.1
  haskell-multiplate: update to version 0.0.2
  haskell-irc: update to version 0.5.1.0
  haskell-accelerate-cuda: update to version 0.12.1.1
  Add package haskell-digestive-functors-heist
  Lilypond: update to 2.14.2
  go: patching it to get the nixos cacert bundle taken just fine
  surf: updating to 0.5, and making it build.
  ...
google-talk-plugin: Prefer Debian package.

The reason is because unpacking debian packages requires fewer dependencies (ar,
gzip and tar, nothing more), and in addition we can explicitly reference a
version number from the apt repository.
Vacuum-IM: update to 1.2.0
Veracity: update to version 2.0
Still no permission support or commit signing, though.
Wine: update to 1.5.10
SBCL: update to 1.0.58
haskell-unix-time: add version 0.1.0
haskell-monad-logger: add version 0.2.0