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
  ...
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': (59 commits)
  chromium: Re-enable legacy sandbox for version 22.
  go: improving the expression so it works if overriden by hg src
  fetchhg: removing the nix dependency
  go: Removing an out of date comment
  go: make it accept armv5tel
  Add node-gyp
  Add npm2nix 0.1.2
  Add npm2nix as a nodePackage
  Add semver node package
  akonadi-1.7.2
  xf86-input-wacom-0.16.0
  Soprano-2.8.0
  SDO-0.10.0
  Add qoauth
  Fix gnokii URL
  Libspectre: a couple of upstream patches (fix 2 crashes)
  Fix libical
  chromium: Don't use the sandbox patch on v21.
  chromium: Drop dependency on subversion.
  chromium: Update to new release channels.
  ...
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': (45 commits)
  Delete obsolete Haskell packages:
  haskell-yesod-core: update to version 1.1.1.1
  haskell-reactive-banana: update to version 0.7.0.1
  haskell-http-types: update to version 0.7.3.0.1
  haskell-cprng-aes: update to version 0.2.4
  haskell-configurator: update to version 0.2.0.1
  haskell-certificate: update to version 1.2.6
  haskell-base64-bytestring: update to version 1.0.0.0
  haskell-asn1-data: update to version 0.7.1
  haskell-abstract-deque: update to version 0.1.6
  haskell-HsOpenSSL: update to version 0.10.3.3
  haskell-gitit: patch to support recent versions of base64-bytestring
  haskell-yesod-static: patch to support recent versions of base64-bytestring
  haskell-http-conduit: patch to support recent versions of base64-bytestring and asn1-data
  haskell-cipher-aes: add version 0.1.1
  Patch linuxsampler so that it can load SFZ state when used as an LV2 plugin: http://tracker.ardour.org/view.php?id=4462
  Adding praat.
  Adding espeakedit, phoneme editor for espeak.
  Add oraclejdk and oraclejre attributes for packages that want to use them
  postgresql-jdbc: Update to 9.1-902
  ...
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':
  experimental/lib-fold-attr
comments
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': (103 commits)
  haskell-split: drop obsolete version 0.1.4.3
  haskell-urlencoded: patch to support recent versions of split
  haskellPackages.liblastfm: initial
  haskellPackages.urlencoded: initial
  haskellPackages.split: add 0.1.4.3
  Tig: cosmetics
  npm2nix: Bump to 0.1.3
  e2fsprogs: minor upgrade to 1.42.5
  2030 Images – for Intel Centrino Wireless-N 2230
  node-packages: add a lot of packages
  node-packages: ability to fix sources that use the impure "latest" dependency
  node-packages: introduced alphabet
  davfs2: upgrade to 1.4.7
  org-mode: upgrade to 7.9.1
  Remove all svn references
  valgrind: update to 3.8.0
  Upgrade Isabelle proof assistant to version 2012
  Upgrade PolyML to version 5.4.1
  sipwitch: update to 1.2.4
  Update Julia to latest revision, include zlib in dependencies
  ...
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': (205 commits)
  Add nss-pam-ldapd version 0.8.10
  Add universe repo for older Ubuntu releases
  Fix incorrect version of Ubuntu Maverick (10.10)
  geeqie: Update to 1.1
  pmtools: add version 20071116
  Make regex-compat and regex-posix compile with ghc-7.6.1.
  curl: Update to 7.27.0
  nvidia-x11: Update to 304.43
  Rename spiceProtocol -> spice_protocol
  LaTeX + Spelling work
  Fix wrapping
  Make Gajim find speller
  linux: Update to 3.2.29
  Gajim: make OpenSSL code work
  Gajim: update to 0.15.1
  Fix Nixpkgs evaluation
  ghc-head: update to version 7.7.20120912
  ghc-7.4.2: add binary snapshot required for bootstrapping ghc 7.7.x
  ghc-wrapper: choose '-package-conf' or '-package-db' flag depending on the version of GHC that's being wrapped
  ghc-wrapper.nix: cosmetic
  ...
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':
  sheevaplug: adding ubifs support to the kernel.
  mtdutils: updating, and making them build
  amd-ucode: updating to 2012-09-10
  linux aufs3: upgrade patch and utils to 20120827 for all 3.x kernels
  linux-3.4: upgrade to 3.4.11
  linux-3.0: upgrade to 3.0.43
  linux-3.5: Updating to 3.5.4
  node.js: upgrade to 0.8.9
  v8: upgrade to 3.11.10.22
  xmonad-extras: pass old version of split
  add: haskell-split older version (0.1)
  youtube-dl: Update to version 2012.02.27.
  chromium: Update dev/beta channels.
  aewan: New package, version 1.0.01.
  hexedit: New package, version 1.2.12.
  sqlite: Update to 3.7.14
  nixUnstable: Update to 1.2pre2910_b674665
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':
  node-packages: add 4 packages
  node-packages: upgrade mongodb and bson (and build native module)
  node-packages: ability to build npms that have native extensions
  nss: Fix and add URL for security_load.patch.
  darcs-to-git: Remove propagatedBuildInputs.
  darcs-to-git: New package from upstream Git.
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': (48 commits)
  popa3d: enable standalone mode
  popa3d: customize for use on NixOS
  popa3d: add version 1.0.2
  Apply patch to shadow which allows dots (.) in user names.
  xorg-server: Enable the SECURITY extension
  openssh: Update to 6.1p1
  Add tzdata
  smartmontools: update drivedb.h to latest version
  Add cipher-block-size node package and remove the nativeDeps argument to build-node-package (buildInputs can just be specified directly)
  dovecot: rename file for version 1.0.3 to improve consistency
  haskell-tagsoup: update to version 0.12.8
  haskell-pwstore-fast: update to version 2.3
  haskell-hashed-storage: update to version 0.5.10
  haskell-splot: add version 0.3.4
  haskell-timeplot: add version 1.0.11
  haskell-vcs-revision: add version 0.0.1
  haskell-strptime: add version 1.0.6
  texlive-beamer: 3.07 -> 3.10 (works with texlive 2012 now)
  haskell-zlib-enum: update to version 0.2.3
  haskell-xmlhtml: update to version 0.2.0.3
  ...
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': (135 commits)
  Typo, fix the googleTalkPlugin
  Make Firefox 15 the default (for realz this time)
  Make Firefox 15 the default
  Fix Firefox config option processing
  freeswitch: updating to stable 1.2.3
  Updating the google talk plugin to 3.6.1 since 3.5.1 is no longer available for download. Although, it does not work correctly on my system.
  systemd: Update to 192
  mosh: update to 1.2.2
  qemu-kvm: Update to 1.2.0
  Adding opus-tools.
  Adding libopus
  ocaml: native code building for ARM on 3.12 and 4.00
  mldonkey: update to 3.1.3
  platforms: adding sha1 to the sheevaplug
  Adding umurmur and protobuf-c.
  picocom: adding picocom, 1.7
  hardlink: update to latest version
  darcs: install bash completion instructions
  pkgs/development/compilers/ghc/with-packages.nix: include bash completion files in the generated environment
  cabal-install: install bash-completion instructions
  ...
gnu-efi: Version 3.0r
edk2: Bump version
Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-file' into experimental/multiple-versions-in-one-file

# By Peter Simons (24) and others
# Via Peter Simons (3) and others
* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (103 commits)
  Adding meta.maintainers
  Adding Debian devscripts. Mostly for uscan.
  Add the Distrho collection of audio plugins
  Upgrading suil (LV2 plugin library) from 0.6.2 to 0.6.4
  Adding Qt and GTK support to suil so that they can be used for the LV2 plugin GUIs
  haxe: Rewrite package from scratch, version 2.10.
  neko: Rewrite package from scratch, version 1.8.2.
  pyaudio: New package, version 0.2.4.
  Add V4L support to SANE
  Fix "Failed to add path to set" error during nixos-rebuild
  thunderbird: Update to 15.0.1
  p7zip: Update to 9.20.1
  cabextract: Update to 1.4
  Add a function ‘getVersion’ to get the version of a derivation
  Add a "smatch" package.
  Remove obsolete versions of Flash
  Flashplayer: add libXcursor to the RPATH
  Fix tarball
  openjdk: Don't use the official build system's boostrapping, do our own.
  LibreOffice 3.6.2.2 bugfix update.
  ...
blender requires libXext
spamassassin: don't pass 'IOSocketInet6'

Adding that package as a build input makes SpamAssassin print "function
re-defined" warnings at run-time.