Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/development/compilers/ghc/with-packages.nix		2013-08-16 22:51:13 +02:00
..
all-packages.nix	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
guile-2-test.nix
haskell-defaults.nix
haskell-packages.nix	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
make-tarball.nix
mingw.nix
node-packages-generated.nix	express-form needs express, but it does not get extracted by npm2nix. Fixing it manually	2013-08-12 15:20:49 +02:00
node-packages.json	Added express-form and updates nodejs package	2013-08-12 14:57:00 +02:00
node-packages.nix	Revert "Make all node packages available at the top level via their real name/version"	2013-08-16 15:30:49 -04:00
perl-packages.nix	Forks::Super: Disable checks	2013-08-12 14:22:16 +02:00
platforms.nix	Move kernelExtraConfig to common-config.nix (for x86)	2013-08-01 14:35:31 +02:00
python-packages-generated.nix	updated beautifulsoup4 and waitress	2013-08-13 01:33:51 +02:00
python-packages.json	json wasnt formatted correctly and updating pypi2nix script	2013-08-13 01:26:30 +02:00
python-packages.nix	Update boto to 2.9.9	2013-08-15 16:01:36 +02:00
release-cross.nix
release-lib.nix
release-python.nix	webkitSVN: Remove	2013-07-30 16:52:11 +02:00
release-small.nix	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
release.nix	releaseTools.aggregate: Rename ‘members’ to ‘constituents’	2013-08-15 02:29:08 +02:00