Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
all-packages.nix	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
guile-2-test.nix
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 master into stdenv-updates	2013-07-08 10:48:05 +02:00
make-tarball.nix
mingw.nix
node-packages-generated.nix	Added nodejs packages for: bcrypt, nconf, winston, jade, view-helpers, mongoose, passport, gzippo, walk, forever, kue, supertest and should	2013-07-03 17:28:49 +02:00
node-packages.json	Added nodejs packages for: bcrypt, nconf, winston, jade, view-helpers, mongoose, passport, gzippo, walk, forever, kue, supertest and should	2013-07-03 17:28:49 +02:00
node-packages.nix	Make nodePackages individually overridable	2013-05-31 13:27:55 -04:00
perl-packages.nix	String::ToIdentifier::EN: Update to 0.10	2013-06-26 13:37:40 +02:00
platforms.nix	Add HYPERVISOR_GUEST for linux 3.10	2013-06-30 21:42:51 -04:00
python-packages.nix	Merge pull request #729 from bjornfor/python-modules	2013-07-08 00:55:16 -07:00
release-cross.nix	rpi: more packages to cross-compile	2013-05-26 12:54:26 +02:00
release-lib.nix
release-python.nix	Update references to 'rLang' to the new name 'R'.	2013-07-04 23:41:22 +02:00
release-small.nix	release-small: fix bad attr dbus_all	2013-06-28 08:26:34 +02:00
release.nix	Fix reference to firefox21	2013-06-26 11:24:10 +02:00