Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
arduino	ino: set six as dep	2014-08-27 19:02:05 +02:00
compilers	CompCert: update to 2.4	2014-10-05 23:38:16 +01:00
coq-modules	coq-containers: package is broken	2014-10-01 18:39:31 +01:00
eclipse	ecj: Build on Darwin	2014-07-15 11:51:27 +02:00
guile-modules	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
interpreters	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
lisp-modules	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
lua-modules	lua: Fixed luasql.patch	2014-10-01 06:00:06 +01:00
misc	intelgen4asm: Remove obsolete package	2014-08-07 01:32:43 +02:00
mobile	Make path to Xcode configurable	2014-10-02 15:49:33 +02:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
perl-modules	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
pharo	Merge pull request #4274 from DamienCassou/pharo-vm-update	2014-09-30 13:42:45 +02:00
python-modules	python: collision in names when developing 2 and more python packages with nix	2014-09-19 14:23:45 +02:00
qtcreator	qtcreator: Update from 3.1.0 to 3.2.0	2014-10-05 21:23:00 +02:00
r-modules	Merge pull request #4368 from michelk/r-XML	2014-10-04 19:56:18 +02:00
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
web	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00