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
  ...
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.
  ...
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': (261 commits)
  Forgot to commit all-packages.nix for pstack.
  Add pstack, a wrapper script for gdb. Used to be part of gdb.
  cscope: update to 15.8a
  gimp: revert broken gimp-2.6 dependencies
  nodejs: Bump and backport fix to support ESPIPE
  gnutls: Disable tests on FreeBSD.
  qemu-kvm: Revert the qemu update to 1.1.1
  qemu-kvm: I missed a change present in a previous reverted update
  qemu-kvm: update to 1.1.1
  virtualbox: Update to 4.1.20
  nvidia-x11: Update to 304.37
  virtualbox: Drop accidental JDK dependency
  Removed unused jdkPlugin attribute
  Prevent the JDK from appearing in the Nixpkgs channel
  Remove obsolete JDK versions
  Add hacky way to prevent Hydra from building/distributing unfree packages
  stdenv/generic/default.nix: Simplify the code using the "or" construct
  buildNodePackage: Remove absolute path to source tarball to avoid runtime dependency
  Set platforms for packages depending on CUDA to none.
  gimp28 should probably be gimp_2_8
  ...
New TopGit dependency: experimental/multiple-versions-in-one-file
Merge commit 'refs/top-bases/experimental/mingw' into experimental/mingw

* commit 'refs/top-bases/experimental/mingw':
  documentation
  new tg branch experimental/multiple-versions-in-one-file