nixpkgs/pkgs/development/tools
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
..
analysis
boomerang
build-managers
casperjs
cdecl
documentation
gnulib
guile
haskell
java
jq
literate-programming/noweb
misc
neoload
ocaml
parsing
phantomjs
profiling
pydb
selenium
slimerjs
vagrant