Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ...

Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix

2013-05-04 18:28:48 -04:00

..

6.4.2-binary.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.4.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.6.1.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.8.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.8.3.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.10.1-binary.nix

ghc-binary: don't refer to /bin/sh

2013-04-20 23:28:11 +02:00

6.10.1.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.10.2-binary.nix

ghc-binary: don't refer to /bin/sh

2013-04-20 23:28:11 +02:00

6.10.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.10.3.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.10.4.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.11.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.12.1-binary.nix

ghc-binary: don't refer to /bin/sh

2013-04-20 23:28:11 +02:00

6.12.1.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.12.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

6.12.3.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.0.1.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.0.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.0.3.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.0.4-binary.nix

ghc-binary: don't refer to /bin/sh

2013-04-20 23:28:11 +02:00

7.0.4.nix

Darwin: Add mig', lipo', etc. to `stdenvNative'.

2012-04-23 15:47:31 +00:00

7.2.1.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.2.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.4.1.nix

Darwin: Add mig', lipo', etc. to `stdenvNative'.

2012-04-23 15:47:31 +00:00

7.4.2-binary.nix

ghc-binary: don't refer to /bin/sh

2013-04-20 23:28:11 +02:00

7.4.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.6.1.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.6.2.nix

ghc: add meta.license attribute to all compiler versions

2013-03-23 15:58:14 +01:00

7.6.3.nix

ghc: add version 7.6.3 (and a corresponding package set)

2013-04-21 20:10:27 +02:00

head.nix

ghc: bump HEAD compiler to version 7.7

2013-04-24 13:21:05 +02:00

with-packages.nix

ghc-with-packages: set NIX_GHC_XXX variables for runhaskell and runghc, too

2013-03-21 16:26:18 +01:00

wrapper.nix

ghc: greatly simplify the GHC compiler wrapper

2013-04-20 23:28:53 +02:00