nixpkgs - Downstream nixpkgs tree for Spectrum

	Commit message (Expand)	Author	Age
*	Add conntrack-tools and missing dependencies.	ambrop7@gmail.com	2014-11-09
*	Revert "Add conntrack-tools and missing dependencies."	Arseniy Seroka	2014-11-09
*	Merge pull request #4900 from ambrop72/conntrack	Arseniy Seroka	2014-11-09
\|\
\| *	Add conntrack-tools and missing dependencies.	ambrop7@gmail.com	2014-11-08
* \|	ocaml: 4.02.0 -> 4.02.1	Maciek Starzyk	2014-11-08
\|/
*	Bump poppler to 0.28.1 & remove outdated patches.	Moritz Ulrich	2014-11-08
*	remove unused pythonLinkmeWrapper	Domen Kožar	2014-11-08
*	Fixes ocamlscript	Vincent Laporte	2014-11-08
*	fix ccnx build	Domen Kožar	2014-11-08
*	distributed-process-platform: add haskell package	Nikolay Amiantov	2014-11-08
*	rematch: add haskell package	Nikolay Amiantov	2014-11-08
*	ocaml-http: update from 0.1.3 to 0.1.5	Vincent Laporte	2014-11-08
*	ocamlnet: update from 3.7.6 to 3.7.7	Vincent Laporte	2014-11-08
*	Merge pull request #4882 from abbradar/folly	Arseniy Seroka	2014-11-08
\|\
\| *	folly: add package	Nikolay Amiantov	2014-11-08
\| *	libiberty: add package	Nikolay Amiantov	2014-11-08
\| *	double_conversion: add package	Nikolay Amiantov	2014-11-08
* \|	Merge pull request #4883 from abbradar/boost-process	Arseniy Seroka	2014-11-08
\|\ \
\| * \|	boost_process: add package	Nikolay Amiantov	2014-11-08
\| \|/
* \|	Merge pull request #4885 from abbradar/libxls	Arseniy Seroka	2014-11-08
\|\ \
\| * \|	libxls: add package	Nikolay Amiantov	2014-11-08
\| \|/
* \|	Merge pull request #4884 from abbradar/xlslib	Arseniy Seroka	2014-11-08
\|\ \
\| * \|	xlslib: add package	Nikolay Amiantov	2014-11-08
\| \|/
* \|	Merge pull request #4879 from abbradar/cppzmq	Arseniy Seroka	2014-11-08
\|\ \
\| * \|	cppzmq: add package	Nikolay Amiantov	2014-11-08
\| \|/
* \|	Merge pull request #4880 from abbradar/text-binary	Peter Simons	2014-11-08
\|\ \
\| * \|	text-binary: add haskell package	Nikolay Amiantov	2014-11-08
\| \|/
* \|	Merge pull request #4868 from sjmackenzie/new-pkg-ccnx	Peter Simons	2014-11-08
\|\ \ \| \|/ \|/\|
\| *	new package: ccnx	stewart	2014-11-08
* \|	haskell-fixed-vector: add version 0.7.0.0	Peter Simons	2014-11-07
* \|	ghc-head: update to version 7.9.20141106	Peter Simons	2014-11-07
* \|	hasktags: jailbreak to fix build with latest 'json'	Peter Simons	2014-11-07
* \|	haskell-keter: update to version 1.3.5.1	Peter Simons	2014-11-07
* \|	haskell-thyme: update to version 0.3.5.4	Peter Simons	2014-11-07
* \|	haskell-snaplet-redis: update to version 0.1.4.1	Peter Simons	2014-11-07
* \|	haskell-shell-conduit: update to version 4.4	Peter Simons	2014-11-07
* \|	haskell-pipes-text: update to version 0.0.0.13	Peter Simons	2014-11-07
* \|	haskell-pipes-shell: update to version 0.1.3	Peter Simons	2014-11-07
* \|	haskell-persistent: update to version 2.1.1	Peter Simons	2014-11-07
* \|	haskell-monad-logger: update to version 0.3.8	Peter Simons	2014-11-07
* \|	haskell-json: update to version 0.8	Peter Simons	2014-11-07
* \|	haskell-esqueleto: update to version 2.1.2	Peter Simons	2014-11-07
* \|	haskell-conduit: update to version 1.2.2	Peter Simons	2014-11-07
* \|	haskell-conduit-combinators: update to version 0.3.0	Peter Simons	2014-11-07
* \|	haskell-classy-prelude: update to version 0.10.2	Peter Simons	2014-11-07
* \|	haskell-classy-prelude-conduit: update to version 0.10.2	Peter Simons	2014-11-07
* \|	haskell-bifunctors: update to version 4.2	Peter Simons	2014-11-07
* \|	haskell-atomic-primops: update to version 0.6.1	Peter Simons	2014-11-07
* \|	haskell-tagged: update to version 0.7.3	Peter Simons	2014-11-07
* \|	haskell-json-schema: update to version 0.7.1.1	Peter Simons	2014-11-07