From 5318c4652cbfa1673a219d50b48130919be8b78d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:37:40 +0200 Subject: [PATCH] Patch overzealous dependency restrictions in Haskell packages. --- pkgs/development/libraries/haskell/clientsession/default.nix | 3 +++ pkgs/development/libraries/haskell/filestore/default.nix | 3 +++ .../libraries/haskell/happstack/happstack-server.nix | 3 +++ pkgs/development/libraries/haskell/hledger-lib/default.nix | 3 +++ pkgs/development/libraries/haskell/hledger/default.nix | 3 +++ pkgs/development/libraries/haskell/mime-mail/default.nix | 3 +++ pkgs/development/libraries/haskell/pandoc/default.nix | 3 +++ .../development/libraries/haskell/wai-app-static/default.nix | 5 ++++- 8 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index da933207e23..417e568092d 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged ]; + patchPhase = '' + sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' clientsession.cabal + ''; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; description = "Securely store session data in a client-side cookie"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 355c6ef876c..b0cc40d3914 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + patchPhase = '' + sed -i -e 's|split.*,|split,|' filestore.cabal + ''; noHaddock = true; meta = { description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index d171795d266..410eb7e1d05 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { html monadControl mtl network parsec sendfile syb systemFilepath text time transformers transformersBase utf8String xhtml zlib ]; + patchPhase = '' + sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' happstack-server.cabal + ''; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index ef244bcb768..644406ae1ec 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText split time transformers utf8String ]; + patchPhase = '' + sed -i -e 's|,split.*|,split|' hledger-lib.cabal + ''; meta = { homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 815ca1b87fd..efc2936f406 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe shakespeareText split text time utf8String ]; + patchPhase = '' + sed -i -e 's|,split.*|,split|' hledger.cabal + ''; meta = { homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 37e76284919..9abc588a0e7 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -7,6 +7,9 @@ cabal.mkDerivation (self: { buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; + patchPhase = '' + sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' mime-mail.cabal + ''; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index c1aabed388b..8f34d2d88a0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -15,6 +15,9 @@ cabal.mkDerivation (self: { highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; + patchPhase = '' + sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' pandoc.cabal + ''; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index ea4ddd7ae82..e1f2cb9116d 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -13,7 +13,10 @@ cabal.mkDerivation (self: { cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; - meta = { + patchPhase = '' + sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' wai-app-static.cabal + ''; + meta = { homepage = "http://www.yesodweb.com/book/wai"; description = "WAI application for static serving"; license = self.stdenv.lib.licenses.mit;