Ryan Trinkle 92f8d68b99 Merge branch 'master' of https://github.com/NixOS/nixpkgs ... Conflicts: pkgs/development/libraries/haskell/ghcjs-dom/default.nix pkgs/top-level/haskell-packages.nix		2014-10-06 13:12:58 -04:00
..
analysis	spin: update from 6.3.2 to 6.4.1 and add myself to maintainers	2014-10-06 11:19:15 +02:00
apktool
boomerang
boost-build	boost-build: Add derivation	2014-09-21 15:18:16 -07:00
build-managers	Update SCons	2014-10-06 02:43:58 +04:00
casperjs
cdecl
continuous-integration/jenkins	jenkins: update to latest (v1.579)	2014-09-08 17:08:05 +02:00
documentation	gtk-doc: update from 1.18 to 1.21 and add meta information	2014-10-05 22:50:55 +02:00
etcdctl
exercism
gnulib
gocode
guile
haskell	Merge branch 'master' of https://github.com/NixOS/nixpkgs	2014-10-06 13:12:58 -04:00
java
jq
libsigrok
libsigrokdecode
literate-programming/noweb
misc	Merge branch 'master' of https://github.com/NixOS/nixpkgs	2014-10-06 13:12:58 -04:00
neoload	neoload: provide fake fontconfig file (fixes chroot builds)	2014-09-23 09:17:02 +02:00
node-webkit	properly patch nodewebkit	2014-09-13 10:04:37 +02:00
ocaml	Updates camlp5 6.11 -> 6.12	2014-10-01 00:44:15 +01:00
packer
parsing	haskell-Ebnf2ps: update to version 1.0.12	2014-10-06 11:21:39 +02:00
phantomjs
profiling
pydb
quilt
selenium
sigrok-cli
slimerjs	Update SlimerJS	2014-09-24 13:32:46 +04:00
sqsh
vagrant	vagrant: fix hash	2014-09-23 00:24:52 +02:00
watchman
yuicompressor