Re-revert the previous and fix tarball

This reverts commit 155996ebde2a9042b0252954245d298008755dc5.

I'm sorry for the problems. Now I checked the tarball does build locally.
obnam: Update from 1.6.1 to 1.8

(cherry picked from commit bdea35d98bd53b78e1205bef85475aa6101e95bf)
thrift: disable parallel building, as it fails on hydra

(cherry picked from commit 45371d380c4dc8c0e2d38e6aac032681ebd0a180)
twinkle: fix build (fixes #3673)

Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.

CC: maintainer @MarcWeber.
(cherry picked from commit c198a3689890e5b9395480aaae644acd7d3bd675)

Conflicts (trivial):
	pkgs/applications/networking/instant-messengers/twinkle/default.nix
twinkle eval: fix the typo

(cherry picked from commit 2d03fbf75202272f37bf648d06922c2c624f126a)
Update node-packages-generated. Remove packages from node-packages.json that use an npm package that has a cyclic dependency. See also npm2nix#3
cedet: Mark as broken

It has been timing out since forever:

  http://hydra.nixos.org/job/nixos/release-14.04/nixpkgs.emacs23Packages.cedet.x86_64-linux
lockfreeQueue: Don't build on Hydra

It times out: http://hydra.nixos.org/job/nixos/release-14.04/nixpkgs.haskellPackages_ghc763_profiling.lockfreeQueue.x86_64-linux