Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
armv5tel	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
armv6l	linux/bootstrap: Use <nix/fetchurl> to get the static binaries	2013-05-05 11:30:34 -04:00
armv7l
i686	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
loongson2f	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
powerpc	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
x86_64	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00