diff options
Diffstat (limited to 'pkgs/development/tools/haskell')
15 files changed, 38 insertions, 30 deletions
diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index b269ebb4a88cd..6f3ac738bff88 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, alexMeta, happyMeta, haskellSrcMeta }: +{ cabal, alexMeta, Cabal, happyMeta, haskellSrcMeta }: cabal.mkDerivation (self: { pname = "BNFC-meta"; version = "0.2.2"; sha256 = "07jfc0dcrcckibbw0xca1h7x3lnc9jfylfkcs23f0hyg31irf8dx"; - buildDepends = [ alexMeta happyMeta haskellSrcMeta ]; + buildDepends = [ alexMeta Cabal happyMeta haskellSrcMeta ]; meta = { description = "Deriving Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index c06b5eacc24b3..12357617ae8ec 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "BNFC"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://www.cse.chalmers.se/research/group/Language-technology/BNFC/"; description = "A compiler front-end generator"; diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 23739451816f8..74e621fa8d9e5 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -1,4 +1,4 @@ -{ cabal, hint, mtl, network, syb }: +{ cabal, Cabal, filepath, hint, mtl, network, syb }: cabal.mkDerivation (self: { pname = "HaRe"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2"; isLibrary = false; isExecutable = true; - buildDepends = [ hint mtl network syb ]; + buildDepends = [ Cabal filepath hint mtl network syb ]; meta = { homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp"; description = "the Haskell Refactorer"; diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index 0987989051f15..cb476d561f4de 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -1,5 +1,5 @@ -{ cabal, extensibleExceptions, fgl, Graphalyze, graphviz -, haskellSrcExts, mtl, multiset, random +{ cabal, Cabal, extensibleExceptions, fgl, filepath, Graphalyze +, graphviz, haskellSrcExts, mtl, multiset, random }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - extensibleExceptions fgl Graphalyze graphviz haskellSrcExts mtl - multiset random + Cabal extensibleExceptions fgl filepath Graphalyze graphviz + haskellSrcExts mtl multiset random ]; meta = { description = "Static code analysis using graph-theoretic techniques"; diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 5ec29160bb423..6fe78ac9c7c47 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcMeta }: +{ cabal, Cabal, haskellSrcMeta }: cabal.mkDerivation (self: { pname = "alex-meta"; version = "0.2.0.2"; sha256 = "1v47p1nrx2nb92aasq7ml6i0sy1nfyybgm9n4r1sw1g86dg1y8z1"; - buildDepends = [ haskellSrcMeta ]; + buildDepends = [ Cabal haskellSrcMeta ]; meta = { description = "Quasi-quoter for Alex lexers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index 3dd9cb9926ffd..c48a6d6a61dbf 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "cabal-ghci"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal filepath ]; meta = { homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki"; description = "Set up ghci with options taken from a .cabal file"; diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index a57ff5f6b88ed..f89f22d6cbdee 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcMeta, mtl }: +{ cabal, Cabal, haskellSrcMeta, mtl }: cabal.mkDerivation (self: { pname = "happy-meta"; version = "0.2.0.3"; sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9"; - buildDepends = [ haskellSrcMeta mtl ]; + buildDepends = [ Cabal haskellSrcMeta mtl ]; meta = { description = "Quasi-quoter for Happy parsers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 180d0057e1b0a..42f6135856d86 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,4 +1,6 @@ -{ cabal, cpphs, haskellSrcExts, hscolour, transformers, uniplate }: +{ cabal, Cabal, cpphs, filepath, haskellSrcExts, hscolour +, transformers, uniplate +}: cabal.mkDerivation (self: { pname = "hlint"; @@ -7,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - cpphs haskellSrcExts hscolour transformers uniplate + Cabal cpphs filepath haskellSrcExts hscolour transformers uniplate ]; meta = { homepage = "http://community.haskell.org/~ndm/hlint/"; diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index 78863fab18547..16125b5b1158b 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, network, time }: +{ cabal, Cabal, mtl, network, time }: cabal.mkDerivation (self: { pname = "hslogger"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0lk966csxxyjjdg5jg4pzzl5118zj8ms78vn1n9imb7f4vcs8vk7"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl network time ]; + buildDepends = [ Cabal mtl network time ]; meta = { homepage = "http://software.complete.org/hslogger"; description = "Versatile logging framework"; diff --git a/pkgs/development/tools/haskell/tar/0.3.2.0.nix b/pkgs/development/tools/haskell/tar/0.3.2.0.nix index 8bffe95fe890c..02db9131f8a19 100644 --- a/pkgs/development/tools/haskell/tar/0.3.2.0.nix +++ b/pkgs/development/tools/haskell/tar/0.3.2.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "tar"; version = "0.3.2.0"; sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9"; + buildDepends = [ Cabal filepath ]; meta = { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/tar/0.4.0.0.nix b/pkgs/development/tools/haskell/tar/0.4.0.0.nix index 70afaa4aa6ae1..ebabfc2a6f2f8 100644 --- a/pkgs/development/tools/haskell/tar/0.4.0.0.nix +++ b/pkgs/development/tools/haskell/tar/0.4.0.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "tar"; version = "0.4.0.0"; sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3"; + buildDepends = [ Cabal filepath ]; meta = { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 0b05713e7b8ea..8447508101465 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, cairo, deepseq, ghcEvents, glib, gtk, mtl, pango -, time +{ cabal, binary, Cabal, cairo, deepseq, filepath, ghcEvents, glib +, gtk, mtl, pango, time }: cabal.mkDerivation (self: { @@ -9,7 +9,8 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - binary cairo deepseq ghcEvents glib gtk mtl pango time + binary Cabal cairo deepseq filepath ghcEvents glib gtk mtl pango + time ]; configureFlags = "--ghc-options=-rtsopts"; meta = { diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index c50391efd4e6e..0705d1d0a3d8b 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -1,4 +1,4 @@ -{ cabal, haskellSrcExts, mtl, uulib }: +{ cabal, Cabal, filepath, haskellSrcExts, mtl, uulib }: cabal.mkDerivation (self: { pname = "uuagc-bootstrap"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq"; isLibrary = true; isExecutable = true; - buildDepends = [ haskellSrcExts mtl uulib ]; + buildDepends = [ Cabal filepath haskellSrcExts mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 9a0ae50fc9a90..91899c946383c 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, uulib }: +{ cabal, Cabal, filepath, mtl, uulib }: cabal.mkDerivation (self: { pname = "uuagc-cabal"; version = "1.0.2.0"; sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0"; - buildDepends = [ mtl uulib ]; + buildDepends = [ Cabal filepath mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System"; diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 6a662055df47e..277e7f6c273bc 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,4 +1,6 @@ -{ cabal, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal, uulib }: +{ cabal, Cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap +, uuagcCabal, uulib +}: cabal.mkDerivation (self: { pname = "uuagc"; @@ -7,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib + Cabal filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; |