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

..

bootstrap.nix

nixos.org/tarballs -> tarballs.nixos.org

2013-06-25 14:12:16 +02:00

cppflags-include-fix.patch

openjdk: Update to 7u6b24

2013-01-22 12:58:07 -05:00

default.nix

Merge master into stdenv-updates

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

generate-cacerts.pl

openjdk: Create a cacerts file from pkgs.cacerts

2012-10-25 23:33:09 -04:00

make-bootstrap.nix

openjdk: passthru the architecture attribute like oracle jdk6 does.

2012-08-27 12:41:13 -04:00