Merge remote-tracking branch 'origin/stdenv-updates' into illumos

Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
This commit is contained in:
Danny Wilson
2013-03-17 13:22:24 +01:00
388 changed files with 6760 additions and 2009 deletions
@@ -1,14 +1,14 @@
{ cabal, perl, QuickCheck }:
{ cabal, fetchurl, perl, QuickCheck }:
cabal.mkDerivation (self: {
pname = "alex";
version = "3.0.4";
sha256 = "0fgh7ziwxyb140wghh7dpndh41sixcssnba0q942cvkg77m6ah6d";
version = "3.0.5";
sha256 = "0ncnp7cl7dlfcrwzzcp8j59i9j5r66wim1yib9g3b3jkl0bn8cn3";
isLibrary = false;
isExecutable = true;
buildDepends = [ QuickCheck ];
buildTools = [ perl ];
doCheck = false;
patches = [ (fetchurl { url="https://github.com/simonmar/alex/pull/21.patch"; sha256="0apv3rk00gwkf5rqw3467bg6pnamr07zdksbp9khhzzi73k9aq4f"; }) ];
meta = {
homepage = "http://www.haskell.org/alex/";
description = "Alex is a tool for generating lexical analysers in Haskell";