Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging ... Conflicts: pkgs/applications/editors/vim/macvim.nix		2014-11-04 14:30:43 +01:00
..
6.4.2-binary.nix
6.4.2.nix
6.6.1.nix
6.8.2.nix
6.8.3.nix
6.10.1-binary.nix
6.10.1.nix
6.10.2-binary.nix
6.10.2.nix
6.10.3.nix
6.10.4.nix
6.11.nix
6.12.1-binary.nix
6.12.1.nix
6.12.2.nix
6.12.3.nix
7.0.1.nix
7.0.2.nix
7.0.3.nix
7.0.4-binary.nix
7.0.4.nix
7.2.1.nix
7.2.2.nix
7.4.1.nix
7.4.2-binary.nix
7.4.2.nix
7.6.1.nix
7.6.2.nix
7.6.3.nix
7.8.3-binary.nix
7.8.3.nix	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
head.nix
with-packages.nix
wrapper.nix