Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix		2013-04-19 11:48:11 +02:00
..
all-packages.nix	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: remove useless for cabal2nix on GHC 6.10.4	2013-03-30 00:12:36 +01:00
haskell-packages.nix	haskell-packages.nix: fix the implementation of 'cabalNoTest'	2013-04-19 10:46:18 +02:00
make-tarball.nix	Add an "unstable" aggregate to replace the "unstable" view	2013-03-26 11:59:00 +01:00
mingw.nix
node-packages.nix	nodePackages.patchLatest: Handle tarballs whose root directories are already named 'package'	2013-04-03 07:41:02 -04:00
perl-packages.nix	perlPackages.DBIxClass: Disable tests for now	2013-04-16 13:39:41 -04:00
platforms.nix	fuloong linux: add CGROUPS and disable FTRACE	2013-03-30 23:38:39 +01:00
python-packages.nix	obnam: Update to 1.4	2013-04-18 16:09:35 +02:00
release-cross.nix	release-lib.nix: Make the set of supported platforms an argument	2013-03-26 13:12:25 +01:00
release-haskell.nix	release-haskell.nix: optparse-applicative won't build with ghc 6.10.4 because it needs a newer version of Cabal	2013-04-19 10:46:18 +02:00
release-lib.nix	release-lib.nix: Make the set of supported platforms an argument	2013-03-26 13:12:25 +01:00
release-python.nix	Remove some references to non-existent packages	2013-03-08 16:36:59 -05:00
release-small.nix	Merge branch 'master' into stdenv-updates.	2013-04-07 23:37:12 +02:00
release.nix	openssh: Update to 6.2p1	2013-04-12 15:27:13 +02:00