aszlig c7bac81c66 Merge 'mingw-w64' and 'darwin' into cross-win-osx. ... Both branches have quite a lot in common, so it's time for a merge and do the cleanups with respect to both implementations and also generalize both implementations as much as possible. This also closes #1876. Conflicts: pkgs/development/interpreters/lua-5/5.2.nix pkgs/development/libraries/SDL/default.nix pkgs/development/libraries/glew/default.nix pkgs/top-level/all-packages.nix		2014-03-12 10:16:51 +01:00
..
analysis	cppcheck: update from 1.63 to 1.64	2014-03-05 15:32:15 +01:00
boomerang	boomerang: Refactor and fix build.	2013-08-27 04:39:33 +02:00
build-managers	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
casperjs	Fix some more Hydra evaluation errors	2013-10-08 11:07:14 +02:00
cdecl	Setting myself as maintainer for xsane and cdecl, and telling hydra to build them.	2012-03-07 22:20:23 +00:00
documentation	doxygen: Remove 1.7	2014-02-28 18:33:45 +01:00
gnulib	gnulib: update to version 0.1-83-g8008cac	2014-02-17 17:11:58 +01:00
guile	Fix url for guile-lint (geocities is dead now)	2012-06-22 14:36:11 -04:00
haskell	haskell-keter: update to version 1.2.0	2014-03-11 13:50:50 +01:00
java	unmaintain several packages	2013-08-16 23:45:01 +02:00
jq	Adding jq JSON processor	2013-05-20 11:17:20 +04:00
literate-programming/noweb	noweb-2.11b	2010-06-22 19:49:06 +00:00
misc	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00
neoload	neoload: upgrade to 4.1.3	2013-06-04 07:50:59 +02:00
ocaml	Add opam 1.1.1	2014-02-22 19:08:54 +01:00
parsing	Merge master into stdenv-updates	2014-01-20 19:39:28 +01:00
phantomjs	add phantomjs to darwin platform	2014-02-12 00:51:11 +00:00
profiling	systemtap: Remove from linuxPackagesFor	2014-01-02 00:03:49 -05:00
pydb	pydb: mirror://sourceforge.net/ is no longer valid	2013-02-05 20:35:39 +01:00
selenium	Add selenium-server-standalone (submitted by coreyoconnor)	2014-02-27 13:06:33 +01:00
slimerjs	Update SlimerJS to 0.9.0 release	2013-12-30 23:33:22 +04:00
vagrant	Updated vagrant to 1.4.3	2014-02-18 15:23:16 +01:00