nixpkgs

Files

Vladimír Čunát e740b565cf Merge master into stdenv-updates

Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix

2013-12-29 10:01:22 +01:00

2.6

Merge master into stdenv-updates

2013-12-29 10:01:22 +01:00

2.7

Merge branch 'origin/master' into stdenv-updates.

2013-10-18 18:57:24 +02:00

3.2

recurse into python33 and pypy packages

2013-07-29 14:52:19 +02:00

3.3

recurse into python33 and pypy packages