Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv ... Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix		2014-09-08 18:24:58 +02:00
..
analysis	cppcheck: update from 1.65 to 1.66	2014-09-04 19:31:32 +02:00
apktool
boomerang
build-managers	ant: update from 1.9.3 to 1.9.4	2014-09-04 19:31:32 +02:00
casperjs
cdecl
continuous-integration/jenkins
documentation	haskell-haddock: add version 2.15.0	2014-09-02 11:48:19 +02:00
etcdctl
exercism
gnulib
gocode
guile	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
haskell	haskell-timeplot: broken by Chart update	2014-09-02 11:48:20 +02:00
java	Fix many package descriptions	2014-08-24 22:31:37 +02:00
jq	jq: make sure libjq is in library search path	2014-08-18 16:22:51 +02:00
libsigrok
libsigrokdecode
literate-programming/noweb
misc	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
neoload
node-webkit	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
ocaml	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
packer
parsing	Use a more permanent URL for the byacc version we're using	2014-09-01 19:26:21 +01:00
phantomjs
profiling	Fix many package descriptions	2014-08-24 22:31:37 +02:00
pydb	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
quilt
selenium
sigrok-cli
slimerjs	Update SlimerJS	2014-08-31 18:20:07 +04:00
sqsh	Fix many package descriptions	2014-08-24 22:31:37 +02:00
vagrant	fix eval	2014-09-05 00:06:11 +02:00
watchman	Many minor fixes to get things building after recent compiler changes	2014-08-10 23:18:57 -05:00
yuicompressor