Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ... Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix		2013-06-08 15:41:39 +00:00
..
analysis	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
boomerang	boomerang: Fix prefix in dlopen().	2012-08-10 15:02:19 +02:00
build-managers	New package: sbt 0.12.3, a Scala build tool	2013-05-30 12:12:19 +02:00
casperjs	new package: casperjs	2012-12-13 17:51:03 +01: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	Remove myself from the meta.maintainer field of most Haskell packages.	2013-05-11 00:36:59 +02:00
gnulib	gnulib: update to version v0.0-7952-g439b0e9	2013-06-05 22:16:24 +02:00
guile	Fix url for guile-lint (geocities is dead now)	2012-06-22 14:36:11 -04:00
haskell	haskell-cabal2nix: update to version 1.51	2013-06-05 12:17:36 +02:00
java	Add FastJar.	2009-07-27 10:43:20 +00: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 remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
neoload	neoload: upgrade to 4.1.3	2013-06-04 07:50:59 +02:00
ocaml	Upgrade to 1.0.0	2013-03-15 12:41:01 +01:00
parsing	Remove myself from the meta.maintainer field of most Haskell packages.	2013-05-11 00:36:59 +02:00
phantomjs	buildNativeInputs -> nativeBuildInputs	2013-01-13 11:33:45 +01:00
profiling	oprofile: fix via minor update	2013-02-23 23:49:48 +01:00
pydb	pydb: mirror://sourceforge.net/ is no longer valid	2013-02-05 20:35:39 +01:00
selenium	Add chromedriver: a server for running Selenium tests in Chrome	2013-02-26 00:41:10 +01:00