Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. ... Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix		2013-07-30 11:29:30 +02:00
..
all-packages.nix	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
guile-2-test.nix	guile-2-test: Update to 2.0.	2011-02-22 13:39:56 +00:00
haskell-defaults.nix	haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4	2013-06-15 13:18:51 +02:00
haskell-packages.nix	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
make-tarball.nix	Add an "unstable" aggregate to replace the "unstable" view	2013-03-26 11:59:00 +01:00
mingw.nix	* Remove execute permission.	2006-09-11 13:37:46 +00:00
node-packages-generated.nix	Updated nodejs packages	2013-07-25 10:53:18 +02:00
node-packages.json	Added ironhorse nodejs package + updated other node packages	2013-07-23 11:33:48 +02:00
node-packages.nix	node-packages.nix: Actually use nativeDeps	2013-07-27 13:33:18 -04:00
perl-packages.nix	Add perl module HTML::FromANSI and its dependencies. Make Testuseok use the casing that comes out of nix-generate-from-cpan, to prevent needing to special-case it on next generations.	2013-07-25 10:17:09 +02:00
platforms.nix	Enable blowfish/twoflish crypto in sheevaplug kernel	2013-07-20 23:16:50 +02:00
python-packages.nix	Merge pull request #752 from lovek323/matplotlib	2013-07-30 00:54:39 -07:00
release-cross.nix	rpi: more packages to cross-compile	2013-05-26 12:54:26 +02:00
release-lib.nix	mercurial: Update to 2.6.1	2013-05-15 13:15:53 +02:00
release-python.nix	update release-python.nix from python branch	2013-07-27 12:08:36 +02:00
release-small.nix	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
release.nix	fix tarball after 541661	2013-07-17 08:16:24 +02:00