From 070f071469a8847f81633ac9a871c2d0d4359e88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Apr 2014 23:19:52 +0200 Subject: [PATCH] cosmetic: re-generate expressions with cabal2nix --- pkgs/development/libraries/haskell/math-functions/default.nix | 1 - pkgs/development/libraries/haskell/mime-mail/default.nix | 4 ++-- pkgs/development/libraries/haskell/twitter-types/default.nix | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index a7a9d92fb97..b14449626c8 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -12,7 +12,6 @@ cabal.mkDerivation (self: { HUnit ieee754 QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 vector ]; - # fails on i686 at version 0.1.5.2 doCheck = false; meta = { homepage = "https://github.com/bos/math-functions"; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 7ba50976168..e2559c70fee 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,5 +1,5 @@ { cabal, base64Bytestring, blazeBuilder, filepath, hspec, random -, text, sendmail ? "sendmail" +, sendmail ? "sendmail", text }: cabal.mkDerivation (self: { @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { base64Bytestring blazeBuilder filepath random text ]; testDepends = [ blazeBuilder hspec text ]; - configureFlags = [ "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"" ]; + configureFlags = "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\""; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 299d39c4546..a7fb544afc1 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { aeson attoparsec httpTypes HUnit shakespeareText testFramework testFrameworkHunit testFrameworkThPrime text unorderedContainers ]; + doCheck = false; meta = { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; @@ -19,5 +20,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - doCheck = false; })