Revert "nscd: Fix LD_LIBRARY_PATH"

This reverts commit 953f12995be933fb2c1efe314299556e4178e26e.
enable ssl for vsftpd automatically
Merge branch 'experimental/vsftpd' into refs/top-bases/experimental/marc

* experimental/vsftpd:
  enable ssl for vsftpd automatically
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  enable ssl for vsftpd automatically
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc: (1133 commits)
  updating haxe
  php update
  adding qpdf implementation file
  salut-a-toi: remove distribute dependency (not needed)
  pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
  Updated btrfsprogs from 0.20-git -> 3.12
  Update node packages
  Add haskellPackages.robotsTxt
  Add haskellPackages.heredoc
  Python: get rid of distribute
  matplotlib: get rid of distribute
  Update matplotlib from 1.2.1 -> 1.3.1
  Update tornado from 2.4 -> 3.1.1
  Update pyparsing from 1.5.6 -> 2.0.1
  Update python3 from 3.3.2 -> 3.3.3
  Update python-dateutil from 2.1 -> 2.2
  gnumeric: add platforms, maintainer
  gnumeric: add schemas and icons, refactor
  hicolor_icon_theme: minor update 0.12 -> 0.13
  windowManager.xmonad: Make it configurable and extensible.
  ...
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/nodejs

* experimental/multiple-versions-in-one-file: (1129 commits)
  salut-a-toi: remove distribute dependency (not needed)
  pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
  Updated btrfsprogs from 0.20-git -> 3.12
  Update node packages
  Add haskellPackages.robotsTxt
  Add haskellPackages.heredoc
  Python: get rid of distribute
  matplotlib: get rid of distribute
  Update matplotlib from 1.2.1 -> 1.3.1
  Update tornado from 2.4 -> 3.1.1
  Update pyparsing from 1.5.6 -> 2.0.1
  Update python3 from 3.3.2 -> 3.3.3
  Update python-dateutil from 2.1 -> 2.2
  gnumeric: add platforms, maintainer
  gnumeric: add schemas and icons, refactor
  hicolor_icon_theme: minor update 0.12 -> 0.13
  windowManager.xmonad: Make it configurable and extensible.
  ledger3: Update to latest git (8d38060968)
  xfce4-terminal: bugfix update 0.6.2 -> .3
  Upgrade cppunit to 1.13.2
  ...
Merge commit 'refs/top-bases/experimental/nodejs' into experimental/nodejs

* commit 'refs/top-bases/experimental/nodejs': (1129 commits)
  salut-a-toi: remove distribute dependency (not needed)
  pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
  Updated btrfsprogs from 0.20-git -> 3.12
  Update node packages
  Add haskellPackages.robotsTxt
  Add haskellPackages.heredoc
  Python: get rid of distribute
  matplotlib: get rid of distribute
  Update matplotlib from 1.2.1 -> 1.3.1
  Update tornado from 2.4 -> 3.1.1
  Update pyparsing from 1.5.6 -> 2.0.1
  Update python3 from 3.3.2 -> 3.3.3
  Update python-dateutil from 2.1 -> 2.2
  gnumeric: add platforms, maintainer
  gnumeric: add schemas and icons, refactor
  hicolor_icon_theme: minor update 0.12 -> 0.13
  windowManager.xmonad: Make it configurable and extensible.
  ledger3: Update to latest git (8d38060968)
  xfce4-terminal: bugfix update 0.6.2 -> .3
  Upgrade cppunit to 1.13.2
  ...
Merge branch 'experimental/nodejs' into refs/top-bases/experimental/marc

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

* experimental/multiple-versions-in-one-file: (1129 commits)
  salut-a-toi: remove distribute dependency (not needed)
  pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
  Updated btrfsprogs from 0.20-git -> 3.12
  Update node packages
  Add haskellPackages.robotsTxt
  Add haskellPackages.heredoc
  Python: get rid of distribute
  matplotlib: get rid of distribute
  Update matplotlib from 1.2.1 -> 1.3.1
  Update tornado from 2.4 -> 3.1.1
  Update pyparsing from 1.5.6 -> 2.0.1
  Update python3 from 3.3.2 -> 3.3.3
  Update python-dateutil from 2.1 -> 2.2
  gnumeric: add platforms, maintainer
  gnumeric: add schemas and icons, refactor
  hicolor_icon_theme: minor update 0.12 -> 0.13
  windowManager.xmonad: Make it configurable and extensible.
  ledger3: Update to latest git (8d38060968)
  xfce4-terminal: bugfix update 0.6.2 -> .3
  Upgrade cppunit to 1.13.2
  ...
Merge commit 'refs/top-bases/experimental/xsbt' into experimental/xsbt

* commit 'refs/top-bases/experimental/xsbt': (1129 commits)
  salut-a-toi: remove distribute dependency (not needed)
  pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
  Updated btrfsprogs from 0.20-git -> 3.12
  Update node packages
  Add haskellPackages.robotsTxt
  Add haskellPackages.heredoc
  Python: get rid of distribute
  matplotlib: get rid of distribute
  Update matplotlib from 1.2.1 -> 1.3.1
  Update tornado from 2.4 -> 3.1.1
  Update pyparsing from 1.5.6 -> 2.0.1
  Update python3 from 3.3.2 -> 3.3.3
  Update python-dateutil from 2.1 -> 2.2
  gnumeric: add platforms, maintainer
  gnumeric: add schemas and icons, refactor
  hicolor_icon_theme: minor update 0.12 -> 0.13
  windowManager.xmonad: Make it configurable and extensible.
  ledger3: Update to latest git (8d38060968)
  xfce4-terminal: bugfix update 0.6.2 -> .3
  Upgrade cppunit to 1.13.2
  ...
Merge branch 'experimental/xsbt' into refs/top-bases/experimental/marc

* experimental/xsbt:
Merge commit 'b1a2b37e0cf5639a3672c3380415ae7a2b5fb9d7' into experimental/vsftpd

* commit 'b1a2b37e0cf5639a3672c3380415ae7a2b5fb9d7': (1129 commits)
  salut-a-toi: remove distribute dependency (not needed)
  pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
  Updated btrfsprogs from 0.20-git -> 3.12
  Update node packages
  Add haskellPackages.robotsTxt
  Add haskellPackages.heredoc
  Python: get rid of distribute
  matplotlib: get rid of distribute
  Update matplotlib from 1.2.1 -> 1.3.1
  Update tornado from 2.4 -> 3.1.1
  Update pyparsing from 1.5.6 -> 2.0.1
  Update python3 from 3.3.2 -> 3.3.3
  Update python-dateutil from 2.1 -> 2.2
  gnumeric: add platforms, maintainer
  gnumeric: add schemas and icons, refactor
  hicolor_icon_theme: minor update 0.12 -> 0.13
  windowManager.xmonad: Make it configurable and extensible.
  ledger3: Update to latest git (8d38060968)
  xfce4-terminal: bugfix update 0.6.2 -> .3
  Upgrade cppunit to 1.13.2
  ...
Merge branch 'experimental/vsftpd' into refs/top-bases/experimental/marc

* experimental/vsftpd:
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (105 commits)
  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 (?)
  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
  New TopGit dependency: marc-nixos/virtualbox-server
  New TopGit dependency: marc-nixos/multi-shell-support
  New TopGit dependency: experimental/vsftpd
  fix vim plugins merge failure
  New TopGit dependency: experimental/fonts
  ...
Merge commit '4c9220dd86ab7b6dfd1d3fe7b6819b26071bf5bb' into experimental/marc

* commit '4c9220dd86ab7b6dfd1d3fe7b6819b26071bf5bb': (1136 commits)
  updating haxe
  php update
  adding qpdf implementation file
  salut-a-toi: remove distribute dependency (not needed)
  pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
  Updated btrfsprogs from 0.20-git -> 3.12
  Update node packages
  Add haskellPackages.robotsTxt
  Add haskellPackages.heredoc
  Python: get rid of distribute
  matplotlib: get rid of distribute
  Update matplotlib from 1.2.1 -> 1.3.1
  Update tornado from 2.4 -> 3.1.1
  Update pyparsing from 1.5.6 -> 2.0.1
  Update python3 from 3.3.2 -> 3.3.3
  Update python-dateutil from 2.1 -> 2.2
  gnumeric: add platforms, maintainer
  gnumeric: add schemas and icons, refactor
  hicolor_icon_theme: minor update 0.12 -> 0.13
  windowManager.xmonad: Make it configurable and extensible.
  ...
fix, why did this happen ?
Merge branch 'experimental/ati' into refs/top-bases/experimental/marc

* experimental/ati:
  build samples again
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  build samples again
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc: (323 commits)
  myhasktags update
  this line should not be dropped by this patch
  merge patches nix
  Add gitg: Gnome GUI for git
  Remove "v" prefix from package versions to make them machine-readable
  wireshark: update from 1.10.3 to 1.10.5, potentially fixes CVE-2013-7112, CVE-2013-7113, CVE-2013-7114
  libupnp: update from 1.6.6 to 1.6.19, potentially fixes CVE-2012-5958, CVE-2012-5959, CVE-2012-5960
  Update libmicrohttpd to 0.9.33. CVE-2013-7038, CVE-2013-7039
  p11-kit: 0.7 -> 0.20.1
  remove gnome3.scrollkeeper (obsolete)
  gnome3.gnome-dictionary: 3.5.2 -> 3.10.0
  Add gnome3.dconf
  gnome3.libgweather: 3.6.2 -> 3.10.1
  gnome3.gnome-terminal: 3.4.1.1 -> 3.10.2
  gnome3.gnome_keyring: 3.6.3 -> 3.10.1
  gnome3.gcr: 3.6.3 -> 3.10.1
  gnome3.gconf: 3.2.5 -> 3.2.6
  gnome3: build packages on linux platform
  remove pointless passthru meta
  fix typo in gnome3.libpeas
  ...
Merge commit '8c7573e86b054b14f3fae2b5d9ba404d5fb18cb5' into experimental/vsftpd

* commit '8c7573e86b054b14f3fae2b5d9ba404d5fb18cb5': (319 commits)
  Add gitg: Gnome GUI for git
  Remove "v" prefix from package versions to make them machine-readable
  wireshark: update from 1.10.3 to 1.10.5, potentially fixes CVE-2013-7112, CVE-2013-7113, CVE-2013-7114
  libupnp: update from 1.6.6 to 1.6.19, potentially fixes CVE-2012-5958, CVE-2012-5959, CVE-2012-5960
  Update libmicrohttpd to 0.9.33. CVE-2013-7038, CVE-2013-7039
  p11-kit: 0.7 -> 0.20.1
  remove gnome3.scrollkeeper (obsolete)
  gnome3.gnome-dictionary: 3.5.2 -> 3.10.0
  Add gnome3.dconf
  gnome3.libgweather: 3.6.2 -> 3.10.1
  gnome3.gnome-terminal: 3.4.1.1 -> 3.10.2
  gnome3.gnome_keyring: 3.6.3 -> 3.10.1
  gnome3.gcr: 3.6.3 -> 3.10.1
  gnome3.gconf: 3.2.5 -> 3.2.6
  gnome3: build packages on linux platform
  remove pointless passthru meta
  fix typo in gnome3.libpeas
  Add gnome3.file-roller
  Add gnome3.nautilus and remove gnome2.nautilus (didn't compile)
  add gnome.eog: GNOME Image Viewer
  ...