Add tarsnap package.
Merge branch 'master' of github.com:NixOS/nixpkgs
 - ncmpcpp 0.5.10
 - gphoto2-2.4.14, libgphoto2-2.4.14
 - libarchive-3.0.4
Merge minor updates from jcumming.

This merges branches 'libarchive.121020', 'gphoto2.121020' and 'ncmpcpp.121020'
of git://github.com/jcumming/nixpkgs.

Octopus merge of @jcumming's minor updates, apart flrom updating the version, a
few other changes were made to these packages as well:

 * libarchive: Now depends on xz.
 * libgphoto: License changed to LGPL 2.1 plus.

And he did an overhaul of some of the meta blocks as well.

Changes during this merge:

 * Inline and reword stray comment into meta tag in
   1db34880d71152229c91225b734cac2ffc909810 (libgphoto).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
for eclipse use older cairo. With newer cairo Eclipse crashes after selecting a workspace
Merge branch 'fixes/eclipse' into experimental/marc

* fixes/eclipse:
  for eclipse use older cairo. With newer cairo Eclipse crashes after selecting a workspace
Merge commit 'refs/top-bases/experimental/overlays' into experimental/overlays

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Jack Cummings (1) and others
* commit 'refs/top-bases/experimental/overlays':
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.
Merge branch 'experimental/overlays' into refs/top-bases/experimental/hack-nix

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Jack Cummings (1) and others
* experimental/overlays:
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.
Merge branch 'experimental/overlays' into refs/top-bases/experimental/updates

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Jack Cummings (1) and others
* experimental/overlays:
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.
Merge commit 'refs/top-bases/experimental/hack-nix' into experimental/hack-nix

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Marc Weber (2) and others
* commit 'refs/top-bases/experimental/hack-nix':
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.
Merge branch 'experimental/hack-nix' into refs/top-bases/experimental/updates

* experimental/hack-nix:
Merge commit 'refs/top-bases/experimental/gimp-git' into experimental/gimp-git

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Jack Cummings (1) and others
* commit 'refs/top-bases/experimental/gimp-git':
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/updates

* experimental/gimp-git:
Merge commit 'refs/top-bases/experimental/updates' into experimental/updates

* commit 'refs/top-bases/experimental/updates':
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.

Conflicts:
	pkgs/top-level/all-packages.nix
Merge branch 'experimental/updates' into refs/top-bases/experimental/marc

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Marc Weber (8) and others
* experimental/updates:
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.
Merge branch 'master' into refs/top-bases/experimental/php

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Jack Cummings (1) and others
* master:
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/php

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

# By Jack Cummings (3) and Russell O'Connor (1)
# Via Jack Cummings (1) and others
* commit 'refs/top-bases/experimental/multiple-versions-in-one-file':
  - libarchive-3.0.4
  - gphoto2-2.4.14, libgphoto2-2.4.14
  - ncmpcpp 0.5.10
  Add tarsnap package.