Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/misc/emulators/wine/default.nix		2013-06-10 10:04:46 +04: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
build-managers	New package: sbt 0.12.3, a Scala build tool	2013-05-30 12:12:19 +02:00
casperjs
cdecl
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
haskell	haskell-hlint: update to version 1.8.46	2013-06-09 10:47:15 +02:00
java
jq	Adding jq JSON processor	2013-05-20 11:17:20 +04:00
literate-programming/noweb
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
profiling	oprofile: fix via minor update	2013-02-23 23:49:48 +01:00
pydb
selenium	Add chromedriver: a server for running Selenium tests in Chrome	2013-02-26 00:41:10 +01:00