gutenprintPackage option
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
  gutenprintPackage option
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  gutenprintPackage option
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc: (1081 commits)
  directfb: add meta attributes
  directfb: update from 1.6.2 to 1.6.3
  libusb1: minor update x-1.0.17 -> 1.0.18 (joined)
  git-daemon service: fix typo in option (close #1659)
  libyaml: Patch to fix CVE-2013-6393 (close #1658)
  release-small.nix: Disable FreeBSD
  libsoup: enable introspection (gnome3 stuff needs it)
  gnome3: re-introduce libsoup dependency (fix many evals)
  openssh_hpn: mark as broken ATM, cf. #1640
  pidgin: minor update 2.10.7 -> .8, including CVE-2013-6484
  libarchive: Add extra source URL (close #1655)
  kernel: Upgrade from 3.13.0 -> 3.13.1
  httpd: Respect original order of environment eval.
  httpd: Only add PHPRC to environment of httpd when enablePHP is true.
  fixup previous commit: do the change to attribute
  amdadl-sdk: set license to unfree (close #1647)
  linux: Update to 3.4.78
  Update hipchat
  openssh: Upgrade from 6.4p1 -> 6.5p1
  Revert "Revert "dictd: Update to latest upstream (0.12.1)."" and add the missing libmaa.nix.
  ...
Merge commit '2a7225bb329f3e5a27622270375e913c21485048' into experimental/cups-1.6-and-1.7

* commit '2a7225bb329f3e5a27622270375e913c21485048': (1078 commits)
  directfb: add meta attributes
  directfb: update from 1.6.2 to 1.6.3
  libusb1: minor update x-1.0.17 -> 1.0.18 (joined)
  git-daemon service: fix typo in option (close #1659)
  libyaml: Patch to fix CVE-2013-6393 (close #1658)
  release-small.nix: Disable FreeBSD
  libsoup: enable introspection (gnome3 stuff needs it)
  gnome3: re-introduce libsoup dependency (fix many evals)
  openssh_hpn: mark as broken ATM, cf. #1640
  pidgin: minor update 2.10.7 -> .8, including CVE-2013-6484
  libarchive: Add extra source URL (close #1655)
  kernel: Upgrade from 3.13.0 -> 3.13.1
  httpd: Respect original order of environment eval.
  httpd: Only add PHPRC to environment of httpd when enablePHP is true.
  fixup previous commit: do the change to attribute
  amdadl-sdk: set license to unfree (close #1647)
  linux: Update to 3.4.78
  Update hipchat
  openssh: Upgrade from 6.4p1 -> 6.5p1
  Revert "Revert "dictd: Update to latest upstream (0.12.1)."" and add the missing libmaa.nix.
  ...
Merge branch 'experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/marc

* experimental/cups-1.6-and-1.7:
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (110 commits)
  myhasktags update
  fix tigervnc ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by applying patch to fltk
  fix, why did this happen ?
  adding whatsapp plugin
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  Revert "nscd: Fix LD_LIBRARY_PATH"
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  xsbt is outdated
  merge failure
  depend on cups update
  opt-out cups update:
  Fix .deepOverride on poppler, glib by moving the default derivation into callPackage call
  nix
  New TopGit dependency: experimental/php-koellner-phonetic
  New TopGit dependency: marc-nixos/postfix
  New TopGit dependency: marc-nixos/minimal-install-archive
  ...
Merge commit '89444da37722ce643afa4cdad382c89c95a87fef' into experimental/marc

* commit '89444da37722ce643afa4cdad382c89c95a87fef': (1081 commits)
  directfb: add meta attributes
  directfb: update from 1.6.2 to 1.6.3
  libusb1: minor update x-1.0.17 -> 1.0.18 (joined)
  git-daemon service: fix typo in option (close #1659)
  libyaml: Patch to fix CVE-2013-6393 (close #1658)
  release-small.nix: Disable FreeBSD
  libsoup: enable introspection (gnome3 stuff needs it)
  gnome3: re-introduce libsoup dependency (fix many evals)
  openssh_hpn: mark as broken ATM, cf. #1640
  pidgin: minor update 2.10.7 -> .8, including CVE-2013-6484
  libarchive: Add extra source URL (close #1655)
  kernel: Upgrade from 3.13.0 -> 3.13.1
  httpd: Respect original order of environment eval.
  httpd: Only add PHPRC to environment of httpd when enablePHP is true.
  fixup previous commit: do the change to attribute
  amdadl-sdk: set license to unfree (close #1647)
  linux: Update to 3.4.78
  Update hipchat
  openssh: Upgrade from 6.4p1 -> 6.5p1
  Revert "Revert "dictd: Update to latest upstream (0.12.1)."" and add the missing libmaa.nix.
  ...
Merge branch 'master' into refs/top-bases/experimental/gutenprint

* master:
  silver-searcher: updated to 0.19.1
  ruby/patches.nix: sort attributes alphabetically
  pcsclite: Upgrade from 1.8.8 -> 1.8.10
  ccid: Update from 1.4.13 -> 1.4.14
  xmlindent: New expression
  Fix previous simutrans 112.3 build
  IntelliJ IDEA version bump (13.0.1->13.0.2)
  Add cython3 (python 3), move cython (python 2) to subfolder
  Update cython
  xpra: fix package name
  bcache-tools: new package
  python-dpkt: new package
  ilixi: new package
Merge commit 'refs/top-bases/experimental/gimp-git' into experimental/gimp-git

* commit 'refs/top-bases/experimental/gimp-git':
  silver-searcher: updated to 0.19.1
  ruby/patches.nix: sort attributes alphabetically
  pcsclite: Upgrade from 1.8.8 -> 1.8.10
  ccid: Update from 1.4.13 -> 1.4.14
  xmlindent: New expression
  Fix previous simutrans 112.3 build
  IntelliJ IDEA version bump (13.0.1->13.0.2)
  Add cython3 (python 3), move cython (python 2) to subfolder
  Update cython
  xpra: fix package name
  bcache-tools: new package
  python-dpkt: new package
  ilixi: new package
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/gutenprint

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

* commit 'refs/top-bases/experimental/gutenprint':
  silver-searcher: updated to 0.19.1
  ruby/patches.nix: sort attributes alphabetically
  pcsclite: Upgrade from 1.8.8 -> 1.8.10
  ccid: Update from 1.4.13 -> 1.4.14
  xmlindent: New expression
  Fix previous simutrans 112.3 build
  IntelliJ IDEA version bump (13.0.1->13.0.2)
  Add cython3 (python 3), move cython (python 2) to subfolder
  Update cython
  xpra: fix package name
  bcache-tools: new package
  python-dpkt: new package
  ilixi: new package
Merge commit 'refs/top-bases/experimental/cups-1.6-and-1.7' into experimental/cups-1.6-and-1.7

* commit 'refs/top-bases/experimental/cups-1.6-and-1.7':
  silver-searcher: updated to 0.19.1
  ruby/patches.nix: sort attributes alphabetically
  pcsclite: Upgrade from 1.8.8 -> 1.8.10
  ccid: Update from 1.4.13 -> 1.4.14
  xmlindent: New expression
  Fix previous simutrans 112.3 build
  IntelliJ IDEA version bump (13.0.1->13.0.2)
  Add cython3 (python 3), move cython (python 2) to subfolder
  Update cython
  xpra: fix package name
  bcache-tools: new package
  python-dpkt: new package
  ilixi: new package
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc: (142 commits)
  bazaar: updated to 2.6.0 and fixed ssl bug
  nodejs: update packages
  Add pythonPackages.pysphere 0.1.8
  fontconfig: stop using xml:space; vital for nixos+2.11
  KDE-4.11: update to 4.11.5
  gphoto2: update from 2.5.2 to 2.5.3
  lm_sensors: update from 3.3.4 to 3.3.5
  exiv2: update from 0.23 to 0.24
  openldap: update from 2.4.35 to 2.4.38
  libassuan: update from 2.0.3 to 2.1.1
  nodejs: update packages
  idris-mode: fixed link to homepage (merge #1671)
  nodejs: fix the patch to make it build on darwin
  clarify rename error messages
  Updated node packages
  Force a rebuild.
  telepathy-farstream: Bump.
  mercurialFull: update from 2.8.2 to 2.9
  gcc 4.8: no need for the arm eabi patch.
  Updating tox/toxic
  ...
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/updates

* experimental/gimp-git:
Merge commit 'f4e561bcfaf3ba1bb389a9117f7587071b56b2c2' into experimental/gimp-git

* commit 'f4e561bcfaf3ba1bb389a9117f7587071b56b2c2': (129 commits)
  bazaar: updated to 2.6.0 and fixed ssl bug
  nodejs: update packages
  Add pythonPackages.pysphere 0.1.8
  fontconfig: stop using xml:space; vital for nixos+2.11
  KDE-4.11: update to 4.11.5
  gphoto2: update from 2.5.2 to 2.5.3
  lm_sensors: update from 3.3.4 to 3.3.5
  exiv2: update from 0.23 to 0.24
  openldap: update from 2.4.35 to 2.4.38
  libassuan: update from 2.0.3 to 2.1.1
  nodejs: update packages
  idris-mode: fixed link to homepage (merge #1671)
  nodejs: fix the patch to make it build on darwin
  clarify rename error messages
  Updated node packages
  Force a rebuild.
  telepathy-farstream: Bump.
  mercurialFull: update from 2.8.2 to 2.9
  gcc 4.8: no need for the arm eabi patch.
  Updating tox/toxic
  ...
Merge remote-tracking branch 'refs/remotes/gh/experimental/updates' into HEAD

* refs/remotes/gh/experimental/updates: (55 commits)
  kak update
  adding kakoune editor and enabling faac
  opera update qt, remove libxtc_dxtn
  fix
  .topmsg
  ffmpeg update
  ffmpeg: default to non git version, git version makes gst-ffmpeg fail
  ffmpeg with x11grab
  default to 0.10 version
  default to ffmpeg 0.10
  git version of ffmpeg
  backup tools bup, storeBackup: implement sanity check
  backup tools bup, storeBackup: implement sanity check
  merge problem fix
  adding store-backup
  adding sc
  update
  trying symlinks instead
  adding zimbu
  adding extundelete
  ...
Merge branch 'experimental/updates' into refs/top-bases/experimental/marc

* experimental/updates:
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/cups-1.6-and-1.7' into refs/top-bases/experimental/cups-1.6-and-1.7

* refs/remotes/gh/top-bases/experimental/cups-1.6-and-1.7: (129 commits)
  bazaar: updated to 2.6.0 and fixed ssl bug
  nodejs: update packages
  Add pythonPackages.pysphere 0.1.8
  fontconfig: stop using xml:space; vital for nixos+2.11
  KDE-4.11: update to 4.11.5
  gphoto2: update from 2.5.2 to 2.5.3
  lm_sensors: update from 3.3.4 to 3.3.5
  exiv2: update from 0.23 to 0.24
  openldap: update from 2.4.35 to 2.4.38
  libassuan: update from 2.0.3 to 2.1.1
  nodejs: update packages
  idris-mode: fixed link to homepage (merge #1671)
  nodejs: fix the patch to make it build on darwin
  clarify rename error messages
  Updated node packages
  Force a rebuild.
  telepathy-farstream: Bump.
  mercurialFull: update from 2.8.2 to 2.9
  gcc 4.8: no need for the arm eabi patch.
  Updating tox/toxic
  ...
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/gutenprint' into refs/top-bases/experimental/gutenprint

* refs/remotes/gh/top-bases/experimental/gutenprint: (129 commits)
  bazaar: updated to 2.6.0 and fixed ssl bug
  nodejs: update packages
  Add pythonPackages.pysphere 0.1.8
  fontconfig: stop using xml:space; vital for nixos+2.11
  KDE-4.11: update to 4.11.5
  gphoto2: update from 2.5.2 to 2.5.3
  lm_sensors: update from 3.3.4 to 3.3.5
  exiv2: update from 0.23 to 0.24
  openldap: update from 2.4.35 to 2.4.38
  libassuan: update from 2.0.3 to 2.1.1
  nodejs: update packages
  idris-mode: fixed link to homepage (merge #1671)
  nodejs: fix the patch to make it build on darwin
  clarify rename error messages
  Updated node packages
  Force a rebuild.
  telepathy-farstream: Bump.
  mercurialFull: update from 2.8.2 to 2.9
  gcc 4.8: no need for the arm eabi patch.
  Updating tox/toxic
  ...