Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
all-packages.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
guile-2-test.nix
haskell-defaults.nix	Update default Haskell environment to Haskell Platform 2012.4.0.0.	2012-11-06 18:34:54 +01:00
haskell-packages.nix	haskell-DAV: add version 0.2	2012-11-21 12:30:54 +01:00
make-tarball.nix
mingw.nix
node-packages.nix	Added swig Node.js package	2012-11-09 18:02:44 +01:00
perl-packages.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
platforms.nix	sheevaplug platform: Add hardware watchdog support	2012-10-04 13:11:13 +02:00
python-packages.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
release-cross.nix
release-lib.nix
release-small.nix	Drop non-existent boostFull from release-small.nix	2012-09-24 17:43:47 -04:00
release.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00