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
..
all-packages.nix	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
guile-2-test.nix
haskell-defaults.nix	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
haskell-packages.nix	haskell-hsc3-lang: add missing override for 7.2.x	2014-11-01 21:08:06 +01:00
lua-packages.nix	Merge pull request #4535 from flosse/lua-bitop	2014-10-15 09:41:32 +02:00
make-tarball.nix
node-packages-generated.nix	nodejs: update packages	2014-10-22 22:27:36 +02:00
node-packages.json
node-packages.nix
perl-packages.nix	perlPackages.Encode: update from 2.55 to 2.63	2014-10-27 07:40:24 +02:00
php-packages.nix	change md5sum to sha256sum for a few packages	2014-10-12 16:13:21 +02:00
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	add datadiff and termcolor python packages	2014-10-31 00:50:17 -07:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix	Disable Darwin builds until we get the Darwin machine back	2014-10-22 16:08:42 +02:00