From 4230c95d5682629291ff090f16a53ccea6af85e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:48:29 +0100 Subject: [PATCH] Re-generate some Haskell expressions with cabal2nix. --- pkgs/development/libraries/haskell/atto-lisp/default.nix | 2 +- .../libraries/haskell/bytestring-progress/default.nix | 2 +- pkgs/development/libraries/haskell/haskell-names/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index f7a8edcc3c5..b1873567691 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "atto-lisp"; version = "0.2.1.1"; sha256 = "089chx4g880fbs7gh1mcvfx2xgbqdi1dxdjax6vbw8xiqgw4pzac"; - jailbreak = true; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq text ]; + jailbreak = true; meta = { homepage = "http://github.com/nominolo/atto-lisp"; description = "Efficient parsing and serialisation of S-Expressions"; diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix index f943f4cd729..e9bb268b9fc 100644 --- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self: { version = "1.0.3"; sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs"; buildDepends = [ terminalProgressBar time ]; - noHaddock = true; # fails to build with a parse error + noHaddock = true; meta = { homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index c67f4ccb402..4d5e8388ea2 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass uniplate utf8String ]; + doCheck = false; meta = { homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; @@ -25,5 +26,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - doCheck = false; })