Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates ... Conflicts (relatively simple): pkgs/development/interpreters/python/2.7/default.nix pkgs/development/libraries/dbus/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/common.nix		2013-06-20 19:21:25 +02:00
..
all-packages.nix	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +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 branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
make-tarball.nix
mingw.nix
node-packages-generated.nix	nijs: bump to 0.0.8	2013-06-11 15:09:10 +02:00
node-packages.json	add nodePackages.jshint	2013-05-30 16:01:18 +02:00
node-packages.nix	Make nodePackages individually overridable	2013-05-31 13:27:55 -04:00
perl-packages.nix	Add Forks::Super	2013-06-17 15:14:40 +02:00
platforms.nix
python-packages.nix	tarman: 1.0 -> 1.0.1	2013-06-20 13:43:32 +02:00
release-cross.nix	rpi: more packages to cross-compile	2013-05-26 12:54:26 +02:00
release-lib.nix
release-python.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
release-small.nix	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
release.nix	release.nix: remove emacs-ecb from nixos-tarball	2013-06-11 11:05:42 +02:00