Vladimír Čunát b4af993c3f Merge branch 'master' into staging ...

Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh

2014-11-14 14:28:23 +01:00

..

2.6

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

2.7

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

3.2

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

3.3

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

3.4

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

docs

…

wrapper.nix

python27FullBuildEnv -> python.buildEnv for all interpreters

2014-10-19 19:48:18 +02:00