Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/top-level/all-packages.nix		2013-10-26 18:28:05 +02:00
..
all-packages.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
guile-2-test.nix
haskell-defaults.nix
haskell-packages.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
make-tarball.nix	Tarball: Match the NixOS version	2013-10-11 13:36:09 +02:00
mingw.nix
node-packages-generated.nix	Update nodePackages and add meat nodePackage	2013-10-18 15:56:33 -04:00
node-packages.json	Update nodePackages and add meat nodePackage	2013-10-18 15:56:33 -04:00
node-packages.nix	updating node packages and adding few to the json list	2013-09-04 19:29:15 +02:00
perl-packages.nix	perlPackages.TemplatePluginJSONEscape: new expression	2013-10-21 19:51:17 +03:00
platforms.nix
python-packages-generated.nix	Update python packages	2013-10-13 15:19:46 +02:00
python-packages.json	Revert "pythonPackage.psycopg2: fix"	2013-10-11 10:44:18 +02:00
python-packages.nix	python-ecdsa: Update to new version 0.10.	2013-10-23 21:16:38 +02:00
r-packages.nix	Wrapped R's package system similarly to perlPackages	2013-09-28 13:19:43 +02:00
release-cross.nix
release-lib.nix
release-python.nix	mountall: Remove	2013-09-18 13:05:23 +02:00
release-small.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-02 22:44:12 +02:00
release.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-02 22:44:12 +02:00