Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates ... Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix		2013-01-27 11:32:12 +01:00
..
all-packages.nix	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: add compiler-specific overrides to fix build of cabal-install	2012-11-26 14:17:38 +01:00
haskell-packages.nix	haskell-reflection: add version 1.1.6	2013-01-25 14:12:02 +01:00
make-tarball.nix	Remove support for the obsolete powerpc-darwin and i686-darwin platforms	2012-11-29 14:10:49 +01:00
mingw.nix
node-packages.nix	node/bson: fix sha256	2013-01-13 14:54:26 +01:00
perl-packages.nix	DBI: revert to 1.616	2013-01-22 11:48:37 +01:00
platforms.nix	Merge branch 'master' into stdenv-updates.	2013-01-04 21:00:53 +01:00
python-packages.nix	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
release-cross.nix	More renames	2012-12-28 19:42:10 +01:00
release-lib.nix	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
release-python.nix	remove some packages also broken in master	2013-01-10 13:10:47 +01:00
release-small.nix	Remove references to some nonexistent packages	2012-12-13 15:28:07 +01:00
release.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00