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

2013-01-22 23:23:53 +01:00
parent 3e2e62ca31 296cd66009
commit 0a47a28f1d
73 changed files with 2686 additions and 1817 deletions
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (rec {

  # XXX: Gnulib's `test-select' fails on FreeBSD:
  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
-  doCheck = (!stdenv.isFreeBSD);
+  doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);

  meta = {
    description = "The GNU Transport Layer Security Library";