Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +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	2014-01-18 14:46:20 +01:00
generate-cacerts.pl	openjdk: Create a cacerts file from pkgs.cacerts	2012-10-25 23:33:09 -04:00
make-bootstrap.nix