Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02: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	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
casperjs
cdecl
documentation	haskell-haddock: add version 2.13.2.1	2013-06-13 10:43:35 +02:00
gnulib	gnulib: update to version v0.0-7952-g439b0e9	2013-06-05 22:16:24 +02:00
guile
haskell	haskell-keter: update to version 0.4.0	2013-07-01 12:11:05 +02:00
java
jq	Adding jq JSON processor	2013-05-20 11:17:20 +04:00
literate-programming/noweb
misc	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
neoload	neoload: upgrade to 4.1.3	2013-06-04 07:50:59 +02:00
ocaml	ocamlPackages.deriving: fix version	2013-06-19 03:20:00 +03:00
parsing	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
phantomjs
profiling
pydb
selenium	Chromedriver: update to 2.0	2013-06-20 09:21:25 -04:00