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
..
arduino	ino: set six as dep	2014-08-27 19:02:05 +02:00
compilers	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02: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 branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
libraries	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
lisp-modules	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
misc	intelgen4asm: Remove obsolete package	2014-08-07 01:32:43 +02:00
mobile	androidsdk: remove obsolete workaround	2014-09-02 19:19:03 +02:00
ocaml-modules	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
perl-modules	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
pharo/vm	Adding myself to the maintainers	2014-08-10 15:57:24 +02:00
python-modules	mpi4py: Disable for Python3 and PyPy	2014-09-07 19:44:08 +02:00
qtcreator	qtcreator: install desktop file	2014-08-02 21:11:36 +02:00
r-modules	Added missing curl dependency to RCurl package	2014-09-03 15:48:33 +10:00
ruby-modules
tools	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
web	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00