nixpkgs/pkgs/development
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
guile-modules
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
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
pharo/vm
python-modules mpi4py: Disable for Python3 and PyPy 2014-09-07 19:44:08 +02:00
qtcreator
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