diff options
546 files changed, 1062 insertions, 1289 deletions
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index cec2da54cf0..b6bfe8df25e 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, filepath, libXrandr, mtl, parsec, stm, time -, utf8String, X11, X11Xft +{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String +, X11, X11Xft }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - Cabal filepath mtl parsec stm time utf8String X11 X11Xft + filepath mtl parsec stm time utf8String X11 X11Xft ]; extraLibraries = [ libXrandr ]; configureFlags = "-fwith_xft"; diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 272b0aefc5f..a76d5ad2eac 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, curl, extensibleExceptions, filepath, hashedStorage +{ cabal, curl, extensibleExceptions, filepath, hashedStorage , haskeline, html, HTTP, mmap, mtl, network, parsec, random , regexCompat, tar, terminfo, text, zlib }: @@ -10,9 +10,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal extensibleExceptions filepath hashedStorage haskeline html - HTTP mmap mtl network parsec random regexCompat tar terminfo text - zlib + extensibleExceptions filepath hashedStorage haskeline html HTTP + mmap mtl network parsec random regexCompat tar terminfo text zlib ]; extraLibraries = [ curl ]; meta = { diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 5c443b6d3a2..6bb06f7d4a5 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, extensibleExceptions, mtl, random, utf8String, X11 -, X11Xft, xmonad +{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft +, xmonad }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.10"; sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq"; buildDepends = [ - Cabal extensibleExceptions mtl random utf8String X11 X11Xft xmonad + extensibleExceptions mtl random utf8String X11 X11Xft xmonad ]; meta = { homepage = "http://xmonad.org/"; diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index b88841426a3..249310b6411 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, hint, HList, libmpd, mtl, network, parsec, random +{ cabal, hint, HList, libmpd, mtl, network, parsec, random , regexPosix, split, X11, xmonad, xmonadContrib }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.10.1"; sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27"; buildDepends = [ - Cabal hint HList libmpd mtl network parsec random regexPosix split - X11 xmonad xmonadContrib + hint HList libmpd mtl network parsec random regexPosix split X11 + xmonad xmonadContrib ]; noHaddock = true; meta = { diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix index 427736615e0..1b772b8dc71 100644 --- a/pkgs/development/compilers/Agda-executable/default.nix +++ b/pkgs/development/compilers/Agda-executable/default.nix @@ -1,4 +1,4 @@ -{ cabal, Agda, Cabal }: +{ cabal, Agda }: cabal.mkDerivation (self: { pname = "Agda-executable"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p"; isLibrary = false; isExecutable = true; - buildDepends = [ Agda Cabal ]; + buildDepends = [ Agda ]; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "Command-line program for type-checking and compiling Agda programs"; diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix index 076bd84640b..e4b78876c57 100644 --- a/pkgs/development/libraries/haskell/AC-Vector/default.nix +++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "AC-Vector"; version = "2.3.2"; sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay"; - buildDepends = [ Cabal ]; meta = { description = "Efficient geometric vectors and transformations"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index 104a0513987..c40ccaa04f3 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -1,4 +1,4 @@ -{ cabal, alex, binary, Cabal, filepath, happy, hashable, hashtables +{ cabal, alex, binary, filepath, happy, hashable, hashtables , haskeline, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib }: @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary Cabal filepath hashable hashtables haskeline haskellSrcExts - mtl QuickCheck syb xhtml zlib + binary filepath hashable hashtables haskeline haskellSrcExts mtl + QuickCheck syb xhtml zlib ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix index 724b00c6476..347fc5ff9c9 100644 --- a/pkgs/development/libraries/haskell/AspectAG/default.nix +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HList, mtl }: +{ cabal, HList, mtl }: cabal.mkDerivation (self: { pname = "AspectAG"; version = "0.3.4.1"; sha256 = "12iaf27crynwnnd7qm1zvvaj6zw6i6c05mb4dsq55dnhph2l356g"; - buildDepends = [ Cabal HList mtl ]; + buildDepends = [ HList mtl ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; description = "Attribute Grammars in the form of an EDSL"; diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index 1ddbef327ac..720d6046169 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "Boolean"; version = "0.0.1"; sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765"; - buildDepends = [ Cabal ]; meta = { description = "Generalized booleans"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index d7df45f6cf3..1976472da23 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, cairo, colour, dataAccessor, dataAccessorTemplate -, mtl, time +{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl +, time }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.15"; sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4"; buildDepends = [ - Cabal cairo colour dataAccessor dataAccessorTemplate mtl time + cairo colour dataAccessor dataAccessorTemplate mtl time ]; meta = { homepage = "http://www.dockerz.net/software/chart.html"; diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index f07d5160015..d8cfb2ee407 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, MissingH, mtl, parsec }: +{ cabal, MissingH, mtl, parsec }: cabal.mkDerivation (self: { pname = "ConfigFile"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal MissingH mtl parsec ]; + buildDepends = [ MissingH mtl parsec ]; noHaddock = true; meta = { homepage = "http://software.complete.org/configfile"; diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 73cf270728c..98002a4c469 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HTTP, json, mtl, network }: +{ cabal, HTTP, json, mtl, network }: cabal.mkDerivation (self: { pname = "CouchDB"; version = "0.10.1"; sha256 = "1ny62ab0sjrkh7mpxj0ahqrv7c8dh0n5s1g8xl0mq3yiwlrjdsim"; - buildDepends = [ Cabal HTTP json mtl network ]; + buildDepends = [ HTTP json mtl network ]; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index 525e6af08ac..0adb00ccc86 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, HUnit, QuickCheck, random }: +{ cabal, HUnit, QuickCheck, random }: cabal.mkDerivation (self: { pname = "Crypto"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal HUnit QuickCheck random ]; + buildDepends = [ HUnit QuickCheck random ]; meta = { description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index 8ade61252a7..0ccc9d810df 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl +{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl , Pathfinder, syb, text, xhtml }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.7.8"; sha256 = "1mlym2hs7sr78lih8c0yi5y5h14vxy3zpl3gfnidh9wiw5cai9lg"; buildDepends = [ - Cabal convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb - text xhtml + convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text + xhtml ]; meta = { description = "Database Supported Haskell"; diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 8ba20bf09cb..f54344882bb 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "Diff"; version = "0.1.3"; sha256 = "02dhy4rp3mkzm5x3h1rkdin2h8qcb7h7nhn14gl2gvl6wdykfh5w"; - buildDepends = [ Cabal ]; meta = { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix index 9cb44f2bd95..e7167baab7d 100644 --- a/pkgs/development/libraries/haskell/FerryCore/default.nix +++ b/pkgs/development/libraries/haskell/FerryCore/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HaXml, mtl, parsec, TableAlgebra }: +{ cabal, HaXml, mtl, parsec, TableAlgebra }: cabal.mkDerivation (self: { pname = "FerryCore"; version = "0.4.6.4"; sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp"; - buildDepends = [ Cabal HaXml mtl parsec TableAlgebra ]; + buildDepends = [ HaXml mtl parsec TableAlgebra ]; meta = { description = "Ferry Core Components"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index dc25efc5053..1a9179b9877 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, libX11, mesa, OpenGL }: +{ cabal, libX11, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLFW"; version = "0.5.0.1"; sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6"; - buildDepends = [ Cabal OpenGL ]; + buildDepends = [ OpenGL ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://haskell.org/haskellwiki/GLFW"; diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index 84c9de49d24..1397bea4f2b 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, freeglut, mesa, OpenGLRaw }: +{ cabal, freeglut, mesa, OpenGLRaw }: cabal.mkDerivation (self: { pname = "GLURaw"; version = "1.2.0.0"; sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1"; - buildDepends = [ Cabal OpenGLRaw ]; + buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix index 779e5811854..302b1fb8fb9 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -1,12 +1,10 @@ -{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa -, OpenGL -}: +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.1.1.2"; sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; - buildDepends = [ Cabal OpenGL ]; + buildDepends = [ OpenGL ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index d8ed1d01b42..d6551c6c6d9 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -1,12 +1,10 @@ -{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa -, OpenGL -}: +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.1.2.1"; sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; - buildDepends = [ Cabal OpenGL ]; + buildDepends = [ OpenGL ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index f98aef780a7..3248631be3e 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -1,12 +1,12 @@ -{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa -, OpenGL, StateVar, Tensor +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL +, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.2.2.1"; sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw"; - buildDepends = [ Cabal OpenGL StateVar Tensor ]; + buildDepends = [ OpenGL StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix index e05cd1b8e35..109ea000b43 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix @@ -1,12 +1,12 @@ -{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa -, OpenGL, OpenGLRaw, StateVar, Tensor +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL +, OpenGLRaw, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.3.0.0"; sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99"; - buildDepends = [ Cabal OpenGL OpenGLRaw StateVar Tensor ]; + buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix index ea8229ace41..421e64ee7a2 100644 --- a/pkgs/development/libraries/haskell/GlomeVec/default.nix +++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "GlomeVec"; version = "0.1.2"; sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index e5a298b38fd..0b918dc4c85 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, HDBC, mtl, odbc, time, utf8String }: +{ cabal, HDBC, mtl, odbc, time, utf8String }: cabal.mkDerivation (self: { pname = "HDBC-odbc"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0vza38ggs863wjh25xnwslwlin68166ywws72bs766rl0rq7fkf4"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal HDBC mtl time utf8String ]; + buildDepends = [ HDBC mtl time utf8String ]; extraLibraries = [ odbc ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix index f51d287ef3c..8ac9548d610 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, HDBC, mtl, parsec, postgresql, time, utf8String }: +{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }: cabal.mkDerivation (self: { pname = "HDBC-postgresql"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal HDBC mtl parsec time utf8String ]; + buildDepends = [ HDBC mtl parsec time utf8String ]; extraLibraries = [ postgresql ]; meta = { homepage = "http://software.complete.org/hdbc-postgresql"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index 9eb87bc8186..aa983026c91 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, HDBC, mtl, sqlite, utf8String }: +{ cabal, HDBC, mtl, sqlite, utf8String }: cabal.mkDerivation (self: { pname = "HDBC-sqlite3"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal HDBC mtl utf8String ]; + buildDepends = [ HDBC mtl utf8String ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://software.complete.org/hdbc-sqlite3"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index 44ffd4861f2..4044c179810 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, convertible, mtl, text, time, utf8String }: +{ cabal, convertible, mtl, text, time, utf8String }: cabal.mkDerivation (self: { pname = "HDBC"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1gqihvsf5w7j8xbn1xy93mdrsh77qwxbhfmyjivbm6i95w1i0kb7"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal convertible mtl text time utf8String ]; + buildDepends = [ convertible mtl text time utf8String ]; meta = { homepage = "https://github.com/hdbc/hdbc"; description = "Haskell Database Connectivity"; diff --git a/pkgs/development/libraries/haskell/HGL/default.nix b/pkgs/development/libraries/haskell/HGL/default.nix index 661f34f5c1e..4b8d6e24c4b 100644 --- a/pkgs/development/libraries/haskell/HGL/default.nix +++ b/pkgs/development/libraries/haskell/HGL/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, X11 }: +{ cabal, X11 }: cabal.mkDerivation (self: { pname = "HGL"; version = "3.2.0.2"; sha256 = "13wcvf6bfii9pihr8m08b81fyslf5n587ds4zzgizbd8m38k81vz"; - buildDepends = [ Cabal X11 ]; + buildDepends = [ X11 ]; meta = { description = "A simple graphics library based on X11 or Win32"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 73716da6e89..657e4899b7b 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "HList"; version = "0.2.3"; sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908"; - buildDepends = [ Cabal ]; meta = { description = "Heterogeneous lists"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 83aad7a8712..98989a7c44b 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass -, text, time, utf8String +{ cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass, text +, time, utf8String }: cabal.mkDerivation (self: { @@ -7,8 +7,7 @@ cabal.mkDerivation (self: { version = "0.6.8"; sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr"; buildDepends = [ - Cabal deepseq filepath mtl parsec syb sybWithClass text time - utf8String + deepseq filepath mtl parsec syb sybWithClass text time utf8String ]; meta = { description = "StringTemplate implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index 76643783414..13d271dfc36 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec }: +{ cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.0.6"; sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b"; - buildDepends = [ Cabal mtl network parsec ]; + buildDepends = [ mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 441f3faa0e4..fee3431829f 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec }: +{ cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.0.9"; sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; - buildDepends = [ Cabal mtl network parsec ]; + buildDepends = [ mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index 5806d8c34b2..d007467e0e3 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec }: +{ cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.1.1"; sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; - buildDepends = [ Cabal mtl network parsec ]; + buildDepends = [ mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index c625223ca24..5dcb4cbe618 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec }: +{ cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.1.2"; sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; - buildDepends = [ Cabal mtl network parsec ]; + buildDepends = [ mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 887b6a72260..a707189ed5e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec }: +{ cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.1"; sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; - buildDepends = [ Cabal mtl network parsec ]; + buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index 89b3ccd674d..082c3ddc3ac 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec }: +{ cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.2"; sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; - buildDepends = [ Cabal mtl network parsec ]; + buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix index dd0779adaf4..ebf561825ce 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "HUnit"; version = "1.2.0.3"; sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12"; - buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix index 7aa09f1c4eb..ec65d160e86 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "HUnit"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix index b34ba884f47..9c58da37b50 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "HUnit"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix index 89ceddf4e1d..e0dd6bd2bc1 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "HUnit"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index 53149cc26f7..80c16e862a2 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, polyparse, random }: +{ cabal, filepath, polyparse, random }: cabal.mkDerivation (self: { pname = "HaXml"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ckmi8iwyaid4mcnh8117s9kq45f8r7sidh6dbhzbj0dl29rrkbz"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath polyparse random ]; + buildDepends = [ filepath polyparse random ]; meta = { homepage = "http://www.cs.york.ac.uk/fp/HaXml/"; description = "Utilities for manipulating XML documents"; diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index c1fbb0653e1..25143e647bb 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, random }: +{ cabal, random }: cabal.mkDerivation (self: { pname = "HaskellForMaths"; version = "0.4.3"; sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns"; - buildDepends = [ Cabal random ]; + buildDepends = [ random ]; meta = { homepage = "http://haskellformaths.blogspot.com/"; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 5a7e1eb5c86..6877e07524d 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, StateVar, transformers }: +{ cabal, StateVar, transformers }: cabal.mkDerivation (self: { pname = "Hipmunk"; version = "5.2.0.6"; sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj"; - buildDepends = [ Cabal StateVar transformers ]; + buildDepends = [ StateVar transformers ]; noHaddock = true; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 90d84c85e6b..1ab60436f68 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, network, openssl, time }: +{ cabal, network, openssl, time }: cabal.mkDerivation (self: { pname = "HsOpenSSL"; version = "0.10.1.2"; sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh"; - buildDepends = [ Cabal network time ]; + buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { homepage = "https://github.com/phonohawk/HsOpenSSL"; diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix index b382232839c..f27d1f97f37 100644 --- a/pkgs/development/libraries/haskell/HsSyck/default.nix +++ b/pkgs/development/libraries/haskell/HsSyck/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, syb, utf8String }: +{ cabal, syb, utf8String }: cabal.mkDerivation (self: { pname = "HsSyck"; version = "0.50"; sha256 = "0ap675i2fngvd1nw1dk8p2fz4nbd2aq5ci8dsvpcjbp28y9j2blm"; - buildDepends = [ Cabal syb utf8String ]; + buildDepends = [ syb utf8String ]; meta = { description = "Fast, lightweight YAML loader and dumper"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/JsContracts/default.nix b/pkgs/development/libraries/haskell/JsContracts/default.nix index b0abdae3290..95a7ab52fd3 100644 --- a/pkgs/development/libraries/haskell/JsContracts/default.nix +++ b/pkgs/development/libraries/haskell/JsContracts/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }: +{ cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }: cabal.mkDerivation (self: { pname = "JsContracts"; @@ -6,9 +6,7 @@ cabal.mkDerivation (self: { sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589"; isLibrary = true; isExecutable = true; - buildDepends = [ - Cabal filepath mtl parsec syb WebBits WebBitsHtml - ]; + buildDepends = [ filepath mtl parsec syb WebBits WebBitsHtml ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "Design-by-contract for JavaScript"; diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 276e9b05602..523f59de5e9 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "ListLike"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://software.complete.org/listlike"; description = "Generic support for list-like structures"; diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix index 1d797c908b1..34856050862 100644 --- a/pkgs/development/libraries/haskell/MaybeT/default.nix +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "MaybeT"; version = "0.1.2"; sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { description = "MaybeT monad transformer"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index adf94c3a9d4..61ba44a4924 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "MemoTrie"; version = "0.4.10"; sha256 = "1hkraq33sai046gwqlabc9nkz6jbl6vgj0c6lc6j4j5h5d8v08kk"; - buildDepends = [ Cabal ]; meta = { homepage = "http://haskell.org/haskellwiki/MemoTrie"; description = "Trie-based memo functions"; diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index f6afb7221f6..b975965752d 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, filepath, hslogger, HUnit, mtl, network, parsec -, random, regexCompat +{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random +, regexCompat }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal filepath hslogger HUnit mtl network parsec random regexCompat + filepath hslogger HUnit mtl network parsec random regexCompat ]; meta = { homepage = "http://software.complete.org/missingh"; diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index ea911a29148..bcbf6b79868 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, mtl }: +{ cabal, extensibleExceptions, mtl }: cabal.mkDerivation (self: { pname = "MonadCatchIO-mtl"; version = "0.3.0.4"; sha256 = "0wzdrfplwa4v9miv88rg3jvf7l6gphc29lpdp5qjm5873y57jxm7"; - buildDepends = [ Cabal extensibleExceptions mtl ]; + buildDepends = [ extensibleExceptions mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; description = "Monad-transformer version of the Control.Exception module"; diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 946abea0add..52080c26a3b 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, transformers }: +{ cabal, extensibleExceptions, transformers }: cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; version = "0.2.2.3"; sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6"; - buildDepends = [ Cabal extensibleExceptions transformers ]; + buildDepends = [ extensibleExceptions transformers ]; meta = { description = "Monad-transformer compatible version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix index f3a21608766..daf961f1550 100644 --- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix +++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "MonadPrompt"; version = "1.0.0.3"; sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { description = "MonadPrompt, implementation & examples"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 365f542d367..f9c68ce7b43 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, random }: +{ cabal, mtl, random }: cabal.mkDerivation (self: { pname = "MonadRandom"; version = "0.1.6"; sha256 = "1429w2h66sf0cw992xj4w9clapcqgpdzmh80as7zxf8l87rarqqp"; - buildDepends = [ Cabal mtl random ]; + buildDepends = [ mtl random ]; meta = { description = "Random-number generation monad"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix index 0d8f7d3206e..4bf301bd66d 100644 --- a/pkgs/development/libraries/haskell/NanoProlog/default.nix +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, ListLike, uuParsinglib }: +{ cabal, ListLike, uuParsinglib }: cabal.mkDerivation (self: { pname = "NanoProlog"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ListLike uuParsinglib ]; + buildDepends = [ ListLike uuParsinglib ]; meta = { description = "Very small interpreter for a Prolog-like language"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 33014e8b5d6..8aa6dec08cb 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "NumInstances"; version = "1.0"; sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy"; - buildDepends = [ Cabal ]; meta = { description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix index a94dafa3d9b..0be7c3dd22c 100755 --- a/pkgs/development/libraries/haskell/ObjectName/default.nix +++ b/pkgs/development/libraries/haskell/ObjectName/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "ObjectName"; version = "1.0.0.0"; sha256 = "0yr1aa0ail2h9qsq2bslcwwq6cxl2lzajmc1laj19r7ks62p32rm"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "Explicitly handled object names"; diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix index 67bf042de8a..2ecc841a8a4 100644 --- a/pkgs/development/libraries/haskell/OneTuple/default.nix +++ b/pkgs/development/libraries/haskell/OneTuple/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "OneTuple"; version = "0.2.1"; sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; - buildDepends = [ Cabal ]; meta = { description = "Singleton Tuple"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index 0b7add71e04..a4a77aa8244 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, ObjectName, openal, StateVar, Tensor }: +{ cabal, ObjectName, openal, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "OpenAL"; version = "1.4.0.0"; sha256 = "1vn9r8fd4zwqm8a9d8bgvi9vs1lmygn8sw1rlv819b5wmjwz3ms2"; - buildDepends = [ Cabal ObjectName StateVar Tensor ]; + buildDepends = [ ObjectName StateVar Tensor ]; extraLibraries = [ openal ]; meta = { homepage = "http://connect.creativelabs.com/openal/"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix index 3967f093311..e74fcdca024 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, libX11, mesa }: +{ cabal, libX11, mesa }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.2.1.1"; sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792"; - buildDepends = [ Cabal ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix index 44c7f4b5f82..65e3da59367 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, libX11, mesa }: +{ cabal, libX11, mesa }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.2.3.0"; sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57"; - buildDepends = [ Cabal ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix index 1d8d4ee9617..73b5c741bbb 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix @@ -1,14 +1,12 @@ -{ cabal, Cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw -, StateVar, Tensor +{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar +, Tensor }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.4.0.2"; sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6"; - buildDepends = [ - Cabal GLURaw ObjectName OpenGLRaw StateVar Tensor - ]; + buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix index 4dae187013c..8e616e4e069 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix @@ -1,14 +1,12 @@ -{ cabal, Cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw -, StateVar, Tensor +{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar +, Tensor }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.5.0.0"; sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j"; - buildDepends = [ - Cabal GLURaw ObjectName OpenGLRaw StateVar Tensor - ]; + buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index 92368c61a54..70c25ea9ac6 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, mesa }: +{ cabal, mesa }: cabal.mkDerivation (self: { pname = "OpenGLRaw"; version = "1.2.0.0"; sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r"; - buildDepends = [ Cabal ]; extraLibraries = [ mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix index d7b0380ed31..ff3bd0b8fb5 100644 --- a/pkgs/development/libraries/haskell/PSQueue/default.nix +++ b/pkgs/development/libraries/haskell/PSQueue/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "PSQueue"; version = "1.1"; sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58"; - buildDepends = [ Cabal ]; meta = { description = "Priority Search Queue"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix index 04a283e19f8..90df60cc8e6 100644 --- a/pkgs/development/libraries/haskell/Pathfinder/default.nix +++ b/pkgs/development/libraries/haskell/Pathfinder/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, libxml2, text }: +{ cabal, libxml2, text }: cabal.mkDerivation (self: { pname = "Pathfinder"; version = "0.5.10"; sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; extraLibraries = [ libxml2 ]; meta = { description = "Relational optimiser and code generator"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix index 9c227eddc64..a459fd95317 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, random }: +{ cabal, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "1.2.0.0"; sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed"; - buildDepends = [ Cabal random ]; + buildDepends = [ random ]; meta = { homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix index 98bbf31b624..c104a4be27a 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, random }: +{ cabal, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "1.2.0.1"; sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; - buildDepends = [ Cabal random ]; + buildDepends = [ random ]; meta = { homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix index 886d5061a45..828255a9860 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, mtl, random }: +{ cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.1.1.1"; sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9"; - buildDepends = [ Cabal extensibleExceptions mtl random ]; + buildDepends = [ extensibleExceptions mtl random ]; meta = { homepage = "http://www.cse.chalmers.se/~koen"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix index 0fbfe74eee7..ac9ac3d2a7d 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, mtl, random }: +{ cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.4.0.1"; sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r"; - buildDepends = [ Cabal extensibleExceptions mtl random ]; + buildDepends = [ extensibleExceptions mtl random ]; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix index 74804a77b6f..8eb413d2b31 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, random }: +{ cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.4.1.1"; sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj"; - buildDepends = [ Cabal extensibleExceptions random ]; + buildDepends = [ extensibleExceptions random ]; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index e4d41ed20a3..69a1c1dc417 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, random }: +{ cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.4.2"; sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; - buildDepends = [ Cabal extensibleExceptions random ]; + buildDepends = [ extensibleExceptions random ]; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 93c913c44d6..c5b8efc67f6 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, Cabal, pureMD5, random, SHA }: +{ cabal, binary, pureMD5, random, SHA }: cabal.mkDerivation (self: { pname = "RSA"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk"; isLibrary = true; isExecutable = true; - buildDepends = [ binary Cabal pureMD5 random SHA ]; + buildDepends = [ binary pureMD5 random SHA ]; meta = { description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix index 5ccb58611d4..6a6211b6263 100644 --- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix +++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HUnit, QuickCheck }: +{ cabal, HUnit, QuickCheck }: cabal.mkDerivation (self: { pname = "Ranged-sets"; version = "0.3.0"; sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l"; - buildDepends = [ Cabal HUnit QuickCheck ]; + buildDepends = [ HUnit QuickCheck ]; meta = { homepage = "http://code.haskell.org/ranged-sets"; description = "Ranged sets for Haskell"; diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 9614d0d608b..908ff5b62a9 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, typeEquality }: +{ cabal, mtl, typeEquality }: cabal.mkDerivation (self: { pname = "RepLib"; version = "0.5.1"; sha256 = "1c6zqi87lmmmiz8amsvhw6wkhg90rhh6yl5vh0a9ism3apwh1i7r"; - buildDepends = [ Cabal mtl typeEquality ]; + buildDepends = [ mtl typeEquality ]; noHaddock = true; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix index eae536c7583..e6695f01358 100644 --- a/pkgs/development/libraries/haskell/SDL-image/default.nix +++ b/pkgs/development/libraries/haskell/SDL-image/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, SDL, SDL_image }: +{ cabal, SDL, SDL_image }: cabal.mkDerivation (self: { pname = "SDL-image"; version = "0.6.1"; sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni"; - buildDepends = [ Cabal SDL ]; + buildDepends = [ SDL ]; extraLibraries = [ SDL_image ]; meta = { description = "Binding to libSDL_image"; diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix index 2c6919de948..674282e30a8 100644 --- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix +++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, SDL, SDL_mixer }: +{ cabal, SDL, SDL_mixer }: cabal.mkDerivation (self: { pname = "SDL-mixer"; version = "0.6.1"; sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1"; - buildDepends = [ Cabal SDL ]; + buildDepends = [ SDL ]; extraLibraries = [ SDL_mixer ]; meta = { description = "Binding to libSDL_mixer"; diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index bc36786a366..f48e0dbab51 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, SDL, SDL_ttf }: +{ cabal, SDL, SDL_ttf }: cabal.mkDerivation (self: { pname = "SDL-ttf"; version = "0.6.1"; sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal"; - buildDepends = [ Cabal SDL ]; + buildDepends = [ SDL ]; extraLibraries = [ SDL_ttf ]; meta = { description = "Binding to libSDL_ttf"; diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index dbdda0e96c8..8adf60f938c 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, SDL }: +{ cabal, SDL }: cabal.mkDerivation (self: { pname = "SDL"; version = "0.6.2"; sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly"; - buildDepends = [ Cabal ]; extraLibraries = [ SDL ]; meta = { description = "Binding to libSDL"; diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index 21a5293583f..659b06f72b7 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, Cabal }: +{ cabal, binary }: cabal.mkDerivation (self: { pname = "SHA"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck"; isLibrary = true; isExecutable = true; - buildDepends = [ binary Cabal ]; + buildDepends = [ binary ]; meta = { description = "Implementations of the SHA suite of message digest functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index da5f2a924ee..755c17eee8e 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, hsemail, network }: +{ cabal, extensibleExceptions, hsemail, network }: cabal.mkDerivation (self: { pname = "SMTPClient"; version = "1.0.4"; sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2"; - buildDepends = [ Cabal extensibleExceptions hsemail network ]; + buildDepends = [ extensibleExceptions hsemail network ]; meta = { description = "A simple SMTP client library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix index 054a095c467..c31f0e5d289 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haskeline, mtl, Shellac }: +{ cabal, haskeline, mtl, Shellac }: cabal.mkDerivation (self: { pname = "Shellac-haskeline"; version = "0.2.0.1"; sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br"; - buildDepends = [ Cabal haskeline mtl Shellac ]; + buildDepends = [ haskeline mtl Shellac ]; meta = { description = "Haskeline backend module for Shellac"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix index dc28a52e7f4..20fee419fe9 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, readline, Shellac }: +{ cabal, readline, Shellac }: cabal.mkDerivation (self: { pname = "Shellac-readline"; version = "0.9"; sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878"; - buildDepends = [ Cabal readline Shellac ]; + buildDepends = [ readline Shellac ]; meta = { description = "Readline backend module for Shellac"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix index 4a2228bd4b6..8f36e8ebc08 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "Shellac"; version = "0.9.5.1"; sha256 = "19fpbh5ijy9xc3rhl9qwyan8jfnz9nsqvnsjxb7kkb7l2bpz4qfp"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://www.cs.princeton.edu/~rdockins/shellac/home/"; description = "A framework for creating shell envinronments"; diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix index abfff4fdff4..95148607b6f 100755 --- a/pkgs/development/libraries/haskell/StateVar/default.nix +++ b/pkgs/development/libraries/haskell/StateVar/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "StateVar"; version = "1.0.0.0"; sha256 = "1c1b6a6nn1cdnba08zzp0645wl482h7yaa69zw2l3wwyyyccjic4"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "State variables"; diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix index 8c1f40c382b..f1c212d7a49 100644 --- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix +++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HaXml, mtl }: +{ cabal, HaXml, mtl }: cabal.mkDerivation (self: { pname = "TableAlgebra"; version = "0.7.1"; sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz"; - buildDepends = [ Cabal HaXml mtl ]; + buildDepends = [ HaXml mtl ]; meta = { description = "Ferry Table Algebra"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix index 7afd1aabd87..3856409819d 100755 --- a/pkgs/development/libraries/haskell/Tensor/default.nix +++ b/pkgs/development/libraries/haskell/Tensor/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "Tensor"; version = "1.0.0.1"; sha256 = "10arhk5gkn5jxpb53r80bblpk0afdax1fc2mik40hj5g5g960cp9"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "Tensor data types"; diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 03ee7e869a5..94c157765d3 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, QuickCheck }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "Vec"; version = "0.9.8"; sha256 = "0yaqy0p2jh2ajf8897vsxl5w6bmavixn6n5cc7w8kdnybpbdms6v"; - buildDepends = [ Cabal QuickCheck ]; + buildDepends = [ QuickCheck ]; meta = { homepage = "http://graphics.cs.ucdavis.edu/~sdillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix index fc02bd89bd9..18371c57f08 100644 --- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix +++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec, syb, WebBits }: +{ cabal, mtl, parsec, syb, WebBits }: cabal.mkDerivation (self: { pname = "WebBits-Html"; version = "1.0.1"; sha256 = "134rmm5ccfsjdr0pdwn2mf81l81rgxapa3wjjfjkxrkxq6hav35n"; - buildDepends = [ Cabal mtl parsec syb WebBits ]; + buildDepends = [ mtl parsec syb WebBits ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix index be596da42fb..cd34f3161f3 100644 --- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix +++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec, syb, WebBits }: +{ cabal, mtl, parsec, syb, WebBits }: cabal.mkDerivation (self: { pname = "WebBits-Html"; version = "1.0.2"; sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal"; - buildDepends = [ Cabal mtl parsec syb WebBits ]; + buildDepends = [ mtl parsec syb WebBits ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix index 91899cab2cf..89161608843 100644 --- a/pkgs/development/libraries/haskell/WebBits/1.0.nix +++ b/pkgs/development/libraries/haskell/WebBits/1.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec, syb }: +{ cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { pname = "WebBits"; version = "1.0"; sha256 = "1xqk4ajywlaq9nb9a02i7c25na5p2qbpc2k9zw93gbapppjiapsc"; - buildDepends = [ Cabal mtl parsec syb ]; + buildDepends = [ mtl parsec syb ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits/2.0.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix index 89ef4903f0f..88502db4dff 100644 --- a/pkgs/development/libraries/haskell/WebBits/2.0.nix +++ b/pkgs/development/libraries/haskell/WebBits/2.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec, syb }: +{ cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { pname = "WebBits"; version = "2.0"; sha256 = "14a1rqlq925f6rdbi8yx44xszj5pvskcmw1gi1bj8hbilgmlwi7f"; - buildDepends = [ Cabal mtl parsec syb ]; + buildDepends = [ mtl parsec syb ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix index 89889e015eb..915ff0b1d60 100644 --- a/pkgs/development/libraries/haskell/WebBits/2.1.nix +++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec, syb }: +{ cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { pname = "WebBits"; version = "2.1"; sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn"; - buildDepends = [ Cabal mtl parsec syb ]; + buildDepends = [ mtl parsec syb ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix index 3f7ffe73c33..d9eee5f5e1c 100644 --- a/pkgs/development/libraries/haskell/X11-xft/default.nix +++ b/pkgs/development/libraries/haskell/X11-xft/default.nix @@ -1,12 +1,11 @@ -{ cabal, Cabal, fontconfig, freetype, libXft, pkgconfig, utf8String -, X11 +{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11 }: cabal.mkDerivation (self: { pname = "X11-xft"; version = "0.3.1"; sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf"; - buildDepends = [ Cabal utf8String X11 ]; + buildDepends = [ utf8String X11 ]; extraLibraries = [ fontconfig freetype pkgconfig ]; pkgconfigDepends = [ libXft ]; configureFlags = "--extra-include-dirs=${freetype}/include/freetype2"; diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index 5141ed9fa11..6b0047085bc 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, libX11, libXext, libXinerama, syb }: +{ cabal, libX11, libXext, libXinerama, syb }: cabal.mkDerivation (self: { pname = "X11"; version = "1.5.0.1"; sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; extraLibraries = [ libX11 libXext libXinerama ]; meta = { homepage = "https://github.com/haskell-pkg-janitors/X11"; diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix index 8f4c3245cee..125da2a795e 100644 --- a/pkgs/development/libraries/haskell/Zwaluw/default.nix +++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "Zwaluw"; version = "0.1"; sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1"; - buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/MedeaMelana/Zwaluw"; description = "Combinators for bidirectional URL routing"; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 58ef9fff5ff..2c55bdfc357 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -1,5 +1,5 @@ -{ cabal, attoparsec, blazeBuilder, Cabal, deepseq, dlist, hashable -, mtl, syb, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl +, syb, text, time, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.6.0.0"; sha256 = "1j8g1q7xr1pgyfyrkbh2zz7fhqshj0q5qg7fczrnsbbzf5k459zw"; buildDepends = [ - attoparsec blazeBuilder Cabal deepseq dlist hashable mtl syb text - time unorderedContainers vector + attoparsec blazeBuilder deepseq dlist hashable mtl syb text time + unorderedContainers vector ]; meta = { homepage = "https://github.com/bos/aeson"; diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix index d5c9e248f25..1f3259c1e6b 100644 --- a/pkgs/development/libraries/haskell/alternative-io/default.nix +++ b/pkgs/development/libraries/haskell/alternative-io/default.nix @@ -1,5 +1,4 @@ -{ cabal, Cabal, liftedBase, monadControl, transformers -, transformersBase +{ cabal, liftedBase, monadControl, transformers, transformersBase }: cabal.mkDerivation (self: { @@ -7,7 +6,7 @@ cabal.mkDerivation (self: { version = "0.0.0"; sha256 = "1nfwiw753m8ljrk47yi5cgncbfkddnr4fz44fk1pv501a86cmk8y"; buildDepends = [ - Cabal liftedBase monadControl transformers transformersBase + liftedBase monadControl transformers transformersBase ]; meta = { description = "IO as Alternative instance"; diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index b3e5b6de5d4..484736c7098 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "ansi-terminal"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "09r4nlpmkis6cp30jkymfas13hz6ph4zqxhvigrxn6s76v7nb5a8"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://batterseapower.github.com/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index 27785292742..5730588ab9e 100755 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -1,4 +1,4 @@ -{ cabal, ansiTerminal, Cabal }: +{ cabal, ansiTerminal }: cabal.mkDerivation (self: { pname = "ansi-wl-pprint"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0"; isLibrary = true; isExecutable = true; - buildDepends = [ ansiTerminal Cabal ]; + buildDepends = [ ansiTerminal ]; meta = { homepage = "http://github.com/batterseapower/ansi-wl-pprint"; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 83d75e4064d..c90d7a0425a 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -1,6 +1,4 @@ -{ cabal, attoparsec, attoparsecEnumerator, Cabal, enumerator, mtl -, text -}: +{ cabal, attoparsec, attoparsecEnumerator, enumerator, mtl, text }: cabal.mkDerivation (self: { pname = "asn1-data"; @@ -9,7 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec attoparsecEnumerator Cabal enumerator mtl text + attoparsec attoparsecEnumerator enumerator mtl text ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-data"; diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 7e810630cb8..20cca829736 100755 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "async"; version = "1.4"; sha256 = "1d24bcvmw687jcf75wgavlhfs55f0va02xhl4xdnj2lrlr19s5dl"; - buildDepends = [ Cabal ]; meta = { homepage = "http://gitorious.org/async/"; description = "Asynchronous Computations"; diff --git a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix index afdc3f473d2..52a16a8ac1c 100644 --- a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix +++ b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, failure }: +{ cabal, failure }: cabal.mkDerivation (self: { pname = "attempt"; version = "0.3.1.1"; sha256 = "0yfn8mh7gy6nh689ic6sygf9d7lk44kpj2wahnljl53k6vw7smv5"; - buildDepends = [ Cabal failure ]; + buildDepends = [ failure ]; meta = { homepage = "http://github.com/snoyberg/attempt/tree/master"; description = "Concrete data type for handling extensible exceptions as failures"; diff --git a/pkgs/development/libraries/haskell/attempt/0.4.0.nix b/pkgs/development/libraries/haskell/attempt/0.4.0.nix index ef1f58cd7ba..2c5fc47ea31 100644 --- a/pkgs/development/libraries/haskell/attempt/0.4.0.nix +++ b/pkgs/development/libraries/haskell/attempt/0.4.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, failure }: +{ cabal, failure }: cabal.mkDerivation (self: { pname = "attempt"; version = "0.4.0"; sha256 = "0n7srd1gy1fa0q1qzizvdgmrc078jyx47115aw85vvl74vh9qyjy"; - buildDepends = [ Cabal failure ]; + buildDepends = [ failure ]; meta = { homepage = "http://github.com/snoyberg/attempt/tree/master"; description = "Concrete data type for handling extensible exceptions as failures"; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 91aeb71a8c9..9a17ef13563 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, Cabal, conduit, text, transformers }: +{ cabal, attoparsec, conduit, text, transformers }: cabal.mkDerivation (self: { pname = "attoparsec-conduit"; version = "0.2.0"; sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9"; - buildDepends = [ attoparsec Cabal conduit text transformers ]; + buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Turn attoparsec parsers into sinks"; diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index 8c2f49624a7..fb755000477 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq, text }: +{ cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "attoparsec"; version = "0.10.1.1"; sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0"; - buildDepends = [ Cabal deepseq text ]; + buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings"; diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix index 009b302d82a..ad73d41f587 100644 --- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix +++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, Cabal, enumerator, text }: +{ cabal, attoparsec, enumerator, text }: cabal.mkDerivation (self: { pname = "attoparsec-enumerator"; version = "0.3"; sha256 = "1sfqcr1mvny9gf0zzggwvs2b20knxrbb208rzaa86ay0b5b5jw5v"; - buildDepends = [ attoparsec Cabal enumerator text ]; + buildDepends = [ attoparsec enumerator text ]; meta = { homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; description = "Pass input from an enumerator to an Attoparsec parser"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 36782ab685f..8818aa2d972 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit -, Cabal, caseInsensitive, conduit, httpConduit, httpTypes, network +, caseInsensitive, conduit, httpConduit, httpTypes, network , tagsoup, text, transformers, unorderedContainers, xmlConduit }: @@ -8,9 +8,9 @@ cabal.mkDerivation (self: { version = "1.0.0"; sha256 = "0a163dhi69gh6zmi43jidxlaknbk1y0frjlwijdf7fp073rh0p87"; buildDepends = [ - aeson attoparsec blazeBuilder blazeBuilderConduit Cabal - caseInsensitive conduit httpConduit httpTypes network tagsoup text - transformers unorderedContainers xmlConduit + aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive + conduit httpConduit httpTypes network tagsoup text transformers + unorderedContainers xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index 88e22b5479f..ae9d23f57d4 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "base-unicode-symbols"; version = "0.2.2.3"; sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j"; - buildDepends = [ Cabal ]; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 3c2cd963253..b09024851de 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "base16-bytestring"; version = "0.1.1.4"; sha256 = "061rxlw5kjwj0s08kml46qpw602xwwp05285gpad8c7baw5mzxlr"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 20ec2b5b66c..304889991f0 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "base64-bytestring"; version = "0.1.1.0"; sha256 = "0vdmwajxg6w924pcsls45bz4bn29xgl3sgvdp2g1jb8f7qb58r7i"; - buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix index 96575043a61..e77d5b96ea7 100644 --- a/pkgs/development/libraries/haskell/base64-string/default.nix +++ b/pkgs/development/libraries/haskell/base64-string/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "base64-string"; version = "0.2"; sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y"; - buildDepends = [ Cabal ]; meta = { homepage = "http://urchin.earth.li/~ian/cabal/base64-string/"; description = "Base64 implementation for String's"; diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index f2f37b9e8bd..5b69e6d901e 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, time }: +{ cabal, mtl, time }: cabal.mkDerivation (self: { pname = "benchpress"; version = "0.2.2.4"; sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf"; - buildDepends = [ Cabal mtl time ]; + buildDepends = [ mtl time ]; meta = { homepage = "http://github.com/tibbe/benchpress"; description = "Micro-benchmarking with detailed statistics"; diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix index 3554c79ea8e..2b132f9cad0 100644 --- a/pkgs/development/libraries/haskell/bimap/default.nix +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "bimap"; version = "0.2.4"; sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/bimap"; description = "Bidirectional mapping between two key types"; diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index 88b727d5d36..340230b506d 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, Cabal, mtl }: +{ cabal, binary, mtl }: cabal.mkDerivation (self: { pname = "binary-shared"; version = "0.8.1"; sha256 = "0niq6hgsawsdg3kkjgkwyrgy8w7pfkqfph5d1x5bzcjrcl982jrg"; - buildDepends = [ binary Cabal mtl ]; + buildDepends = [ binary mtl ]; meta = { homepage = "http://www.leksah.org"; description = "Sharing for the binary package"; diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index 7daa91a703a..9195e24d529 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "binary"; version = "0.5.1.0"; sha256 = "18si0f021447b1kqshar224zyh02gc65z7v82waxcn4igss7gm1a"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/binary/"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix index f94ac01db71..faf51870ae9 100644 --- a/pkgs/development/libraries/haskell/bitarray/default.nix +++ b/pkgs/development/libraries/haskell/bitarray/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "bitarray"; version = "0.0.1"; sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~bkomuves/"; description = "Mutable and immutable bit arrays"; diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix index fd0c243d85c..53f85710281 100644 --- a/pkgs/development/libraries/haskell/bitmap/default.nix +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "bitmap"; version = "0.0.2"; sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~bkomuves/"; description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)"; diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix index b8917e1b7d0..23493e50c19 100644 --- a/pkgs/development/libraries/haskell/bktrees/default.nix +++ b/pkgs/development/libraries/haskell/bktrees/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "bktrees"; version = "0.3.1"; sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9"; - buildDepends = [ Cabal ]; meta = { description = "A set data structure with approximate searching"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 2f4968096b7..da3bd570e05 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, Cabal, conduit, text, transformers }: +{ cabal, blazeBuilder, conduit, text, transformers }: cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; version = "0.2.0"; sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r"; - buildDepends = [ blazeBuilder Cabal conduit text transformers ]; + buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Convert streams of builders to streams of bytestrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index b16b80bc5f5..ccc8d36d6fd 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, Cabal, enumerator, transformers }: +{ cabal, blazeBuilder, enumerator, transformers }: cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; version = "0.2.0.3"; sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n"; - buildDepends = [ blazeBuilder Cabal enumerator transformers ]; + buildDepends = [ blazeBuilder enumerator transformers ]; meta = { homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 7ded6eecf4d..f5835393895 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "blaze-builder"; version = "0.3.1.0"; sha256 = "192pqmr6mcjnflqpvp93nycfbdi0ifab8ifvrxvmwbrdkiidvai6"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; description = "Efficient buffered output"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 37093316a7e..0231b9e8e00 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, Cabal, text }: +{ cabal, blazeBuilder, text }: cabal.mkDerivation (self: { pname = "blaze-html"; version = "0.4.3.1"; sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp"; - buildDepends = [ blazeBuilder Cabal text ]; + buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index 8e01e599d47..67d87905143 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, Cabal, text, time, vector }: +{ cabal, blazeBuilder, text, time, vector }: cabal.mkDerivation (self: { pname = "blaze-textual"; version = "0.2.0.6"; sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737"; - buildDepends = [ blazeBuilder Cabal text time vector ]; + buildDepends = [ blazeBuilder text time vector ]; meta = { homepage = "http://github.com/bos/blaze-textual"; description = "Fast rendering of common datatypes"; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 4ba299f6c75..19f69ede610 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, Cabal }: +{ cabal, binary }: cabal.mkDerivation (self: { pname = "bmp"; version = "1.2.0.2"; sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk"; - buildDepends = [ binary Cabal ]; + buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; description = "Read and write uncompressed BMP image files"; diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index f4f66ff3dfa..53a8ee3ba46 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, Cabal, compactStringFix, cryptohash -, dataBinaryIeee754, mtl, network, time +{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754 +, mtl, network, time }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.1.7"; sha256 = "1dmndq0rx22h9kxv31rxwqhwkgsvqg9qy4l0xmvpcvvl101zj4jx"; buildDepends = [ - binary Cabal compactStringFix cryptohash dataBinaryIeee754 mtl - network time + binary compactStringFix cryptohash dataBinaryIeee754 mtl network + time ]; meta = { homepage = "http://github.com/TonyGen/bson-haskell"; diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index 96ac64628ec..d3af223418b 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "byteorder"; version = "1.0.3"; sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way"; - buildDepends = [ Cabal ]; meta = { homepage = "http://community.haskell.org/~aslatter/code/byteorder"; description = "Exposes the native endianness or byte ordering of the system"; diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index e2be2b384d8..05b316f2412 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -1,10 +1,9 @@ -{ cabal, alex, Cabal }: +{ cabal, alex }: cabal.mkDerivation (self: { pname = "bytestring-lexing"; version = "0.4.0"; sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr"; - buildDepends = [ Cabal ]; buildTools = [ alex ]; meta = { homepage = "http://code.haskell.org/~wren/"; diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix index f891df3b688..cf68d1e7fa5 100755 --- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "bytestring-mmap"; version = "0.2.2"; sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/"; description = "mmap support for strict ByteStrings"; diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix index a95f028033a..20228b9eed1 100644 --- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "bytestring-nums"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/solidsnack/bytestring-nums"; description = "Parse numeric literals from ByteStrings"; diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index b1032cbe3e4..1dc56c420b6 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, Cabal }: +{ cabal, binary }: cabal.mkDerivation (self: { pname = "bytestring-trie"; version = "0.2.3"; sha256 = "1zb4s7fd951swc648szrpx0ldailmdinapgbcg1zajb5c5jq57ga"; - buildDepends = [ binary Cabal ]; + buildDepends = [ binary ]; meta = { homepage = "http://code.haskell.org/~wren/"; description = "An efficient finite map from (byte)strings to values"; diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index c23e392ea33..32d62dad8d0 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,11 +1,10 @@ -{ cabal, Cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib -}: +{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib }: cabal.mkDerivation (self: { pname = "cairo"; version = "0.12.2"; sha256 = "1sa0xfx14y4imq3bd9l0rqrmxls3l9yga249a31zfhcinnr1j9db"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; pkgconfigDepends = [ cairo ]; diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index ec11ff94f97..9d72d8cedf7 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, hashable, text }: +{ cabal, hashable, text }: cabal.mkDerivation (self: { pname = "case-insensitive"; version = "0.4.0.1"; sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7"; - buildDepends = [ Cabal hashable text ]; + buildDepends = [ hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index d0cde7a1c36..1e967675b00 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "cautious-file"; version = "1.0"; sha256 = "1s2la91vk9c99bj0ipzc4r6w81rcs4jfmn0xr1cgjab00bzj880q"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ filepath ]; meta = { description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index becfcc93b45..53c974dd56a 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "cereal"; version = "0.3.5.1"; sha256 = "1a9ri0fs0vh75c9llpjyvqp6qkjciqri6adpyn7hbqrn2z1h0l5n"; - buildDepends = [ Cabal ]; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 6121589cfb8..abb4bcad643 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,5 +1,4 @@ -{ cabal, asn1Data, base64Bytestring, Cabal, cryptoPubkeyTypes, mtl -, time +{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time }: cabal.mkDerivation (self: { @@ -9,7 +8,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - asn1Data base64Bytestring Cabal cryptoPubkeyTypes mtl time + asn1Data base64Bytestring cryptoPubkeyTypes mtl time ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix index a8cc328199d..9cb92640ee4 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec, xhtml }: +{ cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.1"; sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339"; - buildDepends = [ Cabal mtl network parsec xhtml ]; + buildDepends = [ mtl network parsec xhtml ]; meta = { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix index 0e19bd850ff..7e91e25209e 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, network, parsec, xhtml }: +{ cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.2"; sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39"; - buildDepends = [ Cabal mtl network parsec xhtml ]; + buildDepends = [ mtl network parsec xhtml ]; meta = { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix index 44b8e366579..0c1f8d709c3 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix @@ -1,13 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, mtl, network, parsec, xhtml -}: +{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.3"; sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0"; - buildDepends = [ - Cabal extensibleExceptions mtl network parsec xhtml - ]; + buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; description = "A library for writing CGI programs"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix index 21751613844..3621b1fac1b 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix @@ -1,13 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, mtl, network, parsec, xhtml -}: +{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.4"; sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd"; - buildDepends = [ - Cabal extensibleExceptions mtl network parsec xhtml - ]; + buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; description = "A library for writing CGI programs"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix index 654a0c26ae7..686555330f3 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network +{ cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network , parsec, xhtml }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "3001.1.8.2"; sha256 = "09ly7bn5ck563jq1wip5w628g74xj4p1ha9rllfdck33pqrl2mgz"; buildDepends = [ - Cabal extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml + extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index d1fbcc16d0b..4551eafb474 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, hsBibutils, HTTP, json, mtl, network +{ cabal, filepath, hsBibutils, HTTP, json, mtl, network , pandocTypes, parsec, syb, time, utf8String, xml }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.3.4"; sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv"; buildDepends = [ - Cabal filepath hsBibutils HTTP json mtl network pandocTypes parsec - syb time utf8String xml + filepath hsBibutils HTTP json mtl network pandocTypes parsec syb + time utf8String xml ]; meta = { homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 9d8ba2176f6..a59b3b9ef0e 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,4 +1,4 @@ -{ cabal, base64Bytestring, Cabal, cereal, cprngAes, cryptoApi +{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi , cryptocipher, entropy, skein, tagged }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.7.4"; sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss"; buildDepends = [ - base64Bytestring Cabal cereal cprngAes cryptoApi cryptocipher - entropy skein tagged + base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy + skein tagged ]; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index ea87d60e7fe..6f1650724ef 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, transformers }: +{ cabal, filepath, transformers }: cabal.mkDerivation (self: { pname = "cmdargs"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath transformers ]; + buildDepends = [ filepath transformers ]; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index e2d59f0fd25..7b29ba58004 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, split, syb, transformers }: +{ cabal, mtl, split, syb, transformers }: cabal.mkDerivation (self: { pname = "cmdlib"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal mtl split syb transformers ]; + buildDepends = [ mtl split syb transformers ]; meta = { description = "a library for command line parsing & online help"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix index 340b92856b0..702ddd0b9ec 100644 --- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix +++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix @@ -1,4 +1,4 @@ -{ cabal, ansiTerminal, Cabal, haskellLexer }: +{ cabal, ansiTerminal, haskellLexer }: cabal.mkDerivation (self: { pname = "colorize-haskell"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3"; isLibrary = true; isExecutable = true; - buildDepends = [ ansiTerminal Cabal haskellLexer ]; + buildDepends = [ ansiTerminal haskellLexer ]; meta = { homepage = "http://github.com/yav/colorize-haskell"; description = "Highligt Haskell source"; diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index ecfdbbab040..7f4fde5ef97 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "colour"; version = "2.3.3"; sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix index fd79a1413ea..416826298bb 100644 --- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix +++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "compact-string-fix"; version = "0.3.2"; sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n"; - buildDepends = [ Cabal ]; meta = { homepage = "http://twan.home.fmf.nl/compact-string/"; description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 67812b37b7f..d1a26389c7a 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, liftedBase, monadControl, text, transformers +{ cabal, liftedBase, monadControl, text, transformers , transformersBase }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.1"; sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9"; buildDepends = [ - Cabal liftedBase monadControl text transformers transformersBase + liftedBase monadControl text transformers transformersBase ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/containers-deepseq/default.nix b/pkgs/development/libraries/haskell/containers-deepseq/default.nix index fb32e2f3fca..1e7630a93e8 100644 --- a/pkgs/development/libraries/haskell/containers-deepseq/default.nix +++ b/pkgs/development/libraries/haskell/containers-deepseq/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "containers-deepseq"; version = "0.1.0.1"; sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { description = "Provide orphan NFData instances for containers as needed. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 3ffdc6dd759..26b683c1969 100755 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "continued-fractions"; version = "0.9.1.1"; sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh"; - buildDepends = [ Cabal ]; meta = { homepage = "/dev/null"; description = "Continued fractions"; diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix index a9b3131db5c..0450373e8c6 100644 --- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix +++ b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix @@ -1,10 +1,10 @@ -{ cabal, attempt, Cabal, transformers }: +{ cabal, attempt, transformers }: cabal.mkDerivation (self: { pname = "control-monad-attempt"; version = "0.3.0.1"; sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; - buildDepends = [ attempt Cabal transformers ]; + buildDepends = [ attempt transformers ]; meta = { homepage = "http://github.com/snoyberg/control-monad-attempt"; description = "Monad transformer for attempt. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix index ae58c850a2a..6c128285285 100755 --- a/pkgs/development/libraries/haskell/converge/default.nix +++ b/pkgs/development/libraries/haskell/converge/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "converge"; version = "0.1.0.1"; sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj"; - buildDepends = [ Cabal ]; meta = { homepage = "/dev/null"; description = "Limit operations for converging sequences"; diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix index c06ae32ffab..7444583bd9f 100644 --- a/pkgs/development/libraries/haskell/convertible-text/default.nix +++ b/pkgs/development/libraries/haskell/convertible-text/default.nix @@ -1,4 +1,4 @@ -{ cabal, attempt, Cabal, text, time }: +{ cabal, attempt, text, time }: cabal.mkDerivation (self: { pname = "convertible-text"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz"; isLibrary = true; isExecutable = true; - buildDepends = [ attempt Cabal text time ]; + buildDepends = [ attempt text time ]; meta = { homepage = "http://github.com/snoyberg/convertible/tree/text"; description = "Typeclasses and instances for converting between types (deprecated)"; diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix index 2f9db499de8..5497500c0a8 100644 --- a/pkgs/development/libraries/haskell/convertible/default.nix +++ b/pkgs/development/libraries/haskell/convertible/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, text, time }: +{ cabal, mtl, text, time }: cabal.mkDerivation (self: { pname = "convertible"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0qkz760ddshmglmrf47a01978c9zhxfss44b6vmfkwwfcjb7da2b"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal mtl text time ]; + buildDepends = [ mtl text time ]; meta = { homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"; description = "Typeclasses and instances for converting between types"; diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 8d90d754db2..4896ba1d39e 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, Cabal, dataDefault, text, time }: +{ cabal, blazeBuilder, dataDefault, text, time }: cabal.mkDerivation (self: { pname = "cookie"; version = "0.4.0"; sha256 = "1vkz6nys26i0yprb8jkv8iyq9xqnxb0wv07f7s7c448vx4gfln98"; - buildDepends = [ blazeBuilder Cabal dataDefault text time ]; + buildDepends = [ blazeBuilder dataDefault text time ]; meta = { homepage = "http://github.com/snoyberg/cookie"; description = "HTTP cookie parsing and rendering"; diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index d718ff6f7f0..0a40bd29575 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,12 +1,10 @@ -{ cabal, Cabal, cereal, cryptoApi, cryptocipher, entropy, random }: +{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }: cabal.mkDerivation (self: { pname = "cprng-aes"; version = "0.2.3"; sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3"; - buildDepends = [ - Cabal cereal cryptoApi cryptocipher entropy random - ]; + buildDepends = [ cereal cryptoApi cryptocipher entropy random ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 33cf33d2621..0cc873402b2 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, Cabal, deepseq, filepath, hastache, mtl, mwcRandom -, parsec, statistics, time, transformers, vector, vectorAlgorithms +{ cabal, aeson, deepseq, filepath, hastache, mtl, mwcRandom, parsec +, statistics, time, transformers, vector, vectorAlgorithms }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.6.0.1"; sha256 = "0k6ip41w5h1z8gl67a8vsb6c3md5nc4yh1vd6dysp9fqgn0vky0a"; buildDepends = [ - aeson Cabal deepseq filepath hastache mtl mwcRandom parsec - statistics time transformers vector vectorAlgorithms + aeson deepseq filepath hastache mtl mwcRandom parsec statistics + time transformers vector vectorAlgorithms ]; meta = { homepage = "https://github.com/bos/criterion"; diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index f08bf30f712..546392d7087 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, cereal, entropy, largeword, tagged }: +{ cabal, cereal, entropy, largeword, tagged }: cabal.mkDerivation (self: { pname = "crypto-api"; version = "0.9"; sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp"; - buildDepends = [ Cabal cereal entropy largeword tagged ]; + buildDepends = [ cereal entropy largeword tagged ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; description = "A generic interface for cryptographic operations"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index eabaf07aa11..736d5f666d0 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, cereal, conduit, cryptoApi, transformers }: +{ cabal, cereal, conduit, cryptoApi, transformers }: cabal.mkDerivation (self: { pname = "crypto-conduit"; version = "0.1.3.1"; sha256 = "0b8n2njz2ccdb9gql79l96jgv1nlq4ls09d25a2yy9f69w7h1ww5"; - buildDepends = [ Cabal cereal conduit cryptoApi transformers ]; + buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 29e5bdb8d07..27f99665d67 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, cryptoApi }: +{ cabal, cryptoApi }: cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; version = "0.1.1"; sha256 = "0chlz01nlxnh9bk5b97vm6q6ai0ifybkdaynwibj8px418mmbkib"; - buildDepends = [ Cabal cryptoApi ]; + buildDepends = [ cryptoApi ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; description = "Generic cryptography Public keys algorithm types"; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 18d1986663d..a95e3ec1f64 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive -, tagged, vector +{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged +, vector }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal cereal cryptoApi cryptoPubkeyTypes primitive tagged vector + cereal cryptoApi cryptoPubkeyTypes primitive tagged vector ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 7e556e44d92..4336be8318d 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, cereal, cryptoApi, tagged }: +{ cabal, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { pname = "cryptohash"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal cereal cryptoApi tagged ]; + buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash"; description = "collection of crypto hashes, fast, pure and practical"; diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 5f6194f9840..609eb593ebb 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, Cabal, text }: +{ cabal, attoparsec, text }: cabal.mkDerivation (self: { pname = "css-text"; version = "0.1.1"; sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y"; - buildDepends = [ attoparsec Cabal text ]; + buildDepends = [ attoparsec text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix index b37c4d09c56..ae149be79da 100644 --- a/pkgs/development/libraries/haskell/csv/default.nix +++ b/pkgs/development/libraries/haskell/csv/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath, parsec }: +{ cabal, filepath, parsec }: cabal.mkDerivation (self: { pname = "csv"; version = "0.1.2"; sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c"; - buildDepends = [ Cabal filepath parsec ]; + buildDepends = [ filepath parsec ]; meta = { description = "CSV loader and dumper"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix index 1f62732ab86..c512820114f 100644 --- a/pkgs/development/libraries/haskell/curl/default.nix +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, curl }: +{ cabal, curl }: cabal.mkDerivation (self: { pname = "curl"; version = "1.3.7"; sha256 = "0i6d7732p5gn1bcvavbxcg4wd18j425mi1yjg0b29zzz3yl0qhgi"; - buildDepends = [ Cabal ]; extraLibraries = [ curl ]; meta = { description = "Haskell binding to libcurl"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index a938db9dd30..a160aa3f708 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, dataAccessor, utilityHt }: +{ cabal, dataAccessor, utilityHt }: cabal.mkDerivation (self: { pname = "data-accessor-template"; version = "0.2.1.9"; sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc"; - buildDepends = [ Cabal dataAccessor utilityHt ]; + buildDepends = [ dataAccessor utilityHt ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 55f32097037..76bee6c05a8 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, transformers }: +{ cabal, transformers }: cabal.mkDerivation (self: { pname = "data-accessor"; version = "0.2.2.1"; sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb"; - buildDepends = [ Cabal transformers ]; + buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix index 01e8850f519..48786b509fa 100644 --- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, Cabal }: +{ cabal, binary }: cabal.mkDerivation (self: { pname = "data-binary-ieee754"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0i0nclq8858flpp2sl3czwz6rfaykjrlzpvlfr6vlxzf8zvah9kz"; isLibrary = true; isExecutable = true; - buildDepends = [ binary Cabal ]; + buildDepends = [ binary ]; meta = { homepage = "http://john-millikin.com/software/data-binary-ieee754/"; description = "Parser/Serialiser for IEEE-754 floating-point values"; diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 27c26f080e7..593c7b3bd3c 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, dlist }: +{ cabal, dlist }: cabal.mkDerivation (self: { pname = "data-default"; version = "0.3.0"; sha256 = "0nbvknfa9kkc46fl1ffji0ghqb41wwsccmc55mya5zavfq9g05g9"; - buildDepends = [ Cabal dlist ]; + buildDepends = [ dlist ]; meta = { description = "A class for types with a default value"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix index 4eb2d03156f..54c2a05f8f1 100644 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, conduit, convertibleText, dataObject, failure, text +{ cabal, conduit, convertibleText, dataObject, failure, text , transformers, yaml }: @@ -9,8 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal conduit convertibleText dataObject failure text transformers - yaml + conduit convertibleText dataObject failure text transformers yaml ]; meta = { homepage = "http://github.com/snoyberg/data-object-yaml"; diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix index 2fc4fd82b7a..c1b12ab038f 100644 --- a/pkgs/development/libraries/haskell/data-object/default.nix +++ b/pkgs/development/libraries/haskell/data-object/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, failure, text, time }: +{ cabal, failure, text, time }: cabal.mkDerivation (self: { pname = "data-object"; version = "0.3.1.9"; sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; - buildDepends = [ Cabal failure text time ]; + buildDepends = [ failure text time ]; meta = { homepage = "http://github.com/snoyberg/data-object/tree/master"; description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix index 616b3faaf1e..2618ef6a690 100644 --- a/pkgs/development/libraries/haskell/data-reify/default.nix +++ b/pkgs/development/libraries/haskell/data-reify/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "data-reify"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification"; description = "Reify a recursive data structure into an explicit graph"; diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index d224baf4b8d..7f7b65702b0 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "dataenc"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding"; description = "Data encoding library"; diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix index 88ca61486b1..72f3d1c937f 100644 --- a/pkgs/development/libraries/haskell/datetime/default.nix +++ b/pkgs/development/libraries/haskell/datetime/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, QuickCheck, time }: +{ cabal, QuickCheck, time }: cabal.mkDerivation (self: { pname = "datetime"; version = "0.2.1"; sha256 = "1yfg3wvi13r725dhfsmcdw4ns3cgl2ayrb5jck0q8b4crk2dlrzg"; - buildDepends = [ Cabal QuickCheck time ]; + buildDepends = [ QuickCheck time ]; meta = { homepage = "http://github.com/esessoms/datetime"; description = "Utilities to make Data.Time.* easier to use."; diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index 1356396feb7..ccffbe54f02 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "deepseq-th"; version = "0.1.0.2"; sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix index b097d52b57e..2c61618cd08 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.1.0.0"; sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; - buildDepends = [ Cabal ]; meta = { description = "Fully evaluate data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix index 6ec62de1414..4af1d5bff9c 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.1.0.2"; sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135"; - buildDepends = [ Cabal ]; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix index 3034488a6a1..35fca66fa86 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.2.0.1"; sha256 = "0r7lkqhllj7phmn4sq836fmis4wy9fpka4hjzhqzhbbykzys0z7d"; - buildDepends = [ Cabal ]; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix index 492027ec3e6..e2c9c926aa7 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.3.0.0"; sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy"; - buildDepends = [ Cabal ]; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index e3af2b62daf..356dd948e22 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -1,6 +1,4 @@ -{ cabal, Cabal, filepath, haskellSrcExts, syb, transformers -, uniplate -}: +{ cabal, filepath, haskellSrcExts, syb, transformers, uniplate }: cabal.mkDerivation (self: { pname = "derive"; @@ -9,7 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal filepath haskellSrcExts syb transformers uniplate + filepath haskellSrcExts syb transformers uniplate ]; meta = { homepage = "http://community.haskell.org/~ndm/derive/"; diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix index 504c63622d8..99b072b63a4 100644 --- a/pkgs/development/libraries/haskell/derp/default.nix +++ b/pkgs/development/libraries/haskell/derp/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "derp"; version = "0.1.5"; sha256 = "0mpc4hav5iqrcjns5sz8q0v2c0d7nb2hbzn58cmbl7cma2kp36li"; - buildDepends = [ Cabal ]; meta = { description = "Derivative Parsing"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index 16a8e7c8089..b313da931f9 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, zlib }: +{ cabal, zlib }: cabal.mkDerivation (self: { pname = "digest"; version = "0.0.1.0"; sha256 = "1p2fk950ivdj7pvc624y0fx48rdh0ax3rw9606926n60mxi9fca0"; - buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 18558a2ea1d..35b5a8d2440 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, numtype, time }: +{ cabal, numtype, time }: cabal.mkDerivation (self: { pname = "dimensional"; version = "0.10.1.2"; sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn"; - buildDepends = [ Cabal numtype time ]; + buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; description = "Statically checked physical dimensions"; diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 679ffe9b7b4..70c232da691 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "directory-tree"; version = "0.10.0"; sha256 = "08b0w9j55x6c06pri7yvv84n24inhpb4miybdnkyjkjy7r3yy7m4"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ filepath ]; meta = { homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index 29beefb6fef..a88b38650c7 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "dlist"; version = "0.5"; sha256 = "1shr5wlpha68h82gwpndr5441847l01gh3j7szyvnmgzkr0fb027"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~dons/code/dlist/"; description = "Differences lists"; diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix index c17c3f4e8ee..06a3e6a09fe 100644 --- a/pkgs/development/libraries/haskell/dotgen/default.nix +++ b/pkgs/development/libraries/haskell/dotgen/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "dotgen"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "1g5ds0mqkz0lzhcp42hin08azschs3p083ikdk4d5jil8rzl7d8k"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { description = "A simple interface for building .dot graph files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index fc3574d19d9..7c810a29565 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "double-conversion"; version = "0.2.0.4"; sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "https://github.com/bos/double-conversion"; description = "Fast conversion between double precision floating point and text"; diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix index 42615e89e38..81e88b8f58d 100644 --- a/pkgs/development/libraries/haskell/download-curl/default.nix +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, curl, feed, tagsoup, xml }: +{ cabal, curl, feed, tagsoup, xml }: cabal.mkDerivation (self: { pname = "download-curl"; version = "0.1.3"; sha256 = "17g5dnw4yxi4kf5x71bkk4wx1zl8yjs5dd34k6dgnw9wgkz97qw1"; - buildDepends = [ Cabal curl feed tagsoup xml ]; + buildDepends = [ curl feed tagsoup xml ]; meta = { homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix index 63a441e45a9..c0895ac2938 100644 --- a/pkgs/development/libraries/haskell/download/default.nix +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, feed, tagsoup, xml }: +{ cabal, feed, tagsoup, xml }: cabal.mkDerivation (self: { pname = "download"; version = "0.3.2"; sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3"; - buildDepends = [ Cabal feed tagsoup xml ]; + buildDepends = [ feed tagsoup xml ]; meta = { homepage = "http://code.haskell.org/~dons/code/download"; description = "High-level file download based on URLs"; diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index a6aeb49c1e0..0b979e179f4 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols, Cabal, dlist }: +{ cabal, baseUnicodeSymbols, dlist }: cabal.mkDerivation (self: { pname = "dstring"; version = "0.4.0.3"; sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c"; - buildDepends = [ baseUnicodeSymbols Cabal dlist ]; + buildDepends = [ baseUnicodeSymbols dlist ]; meta = { homepage = "https://github.com/basvandijk/dstring"; description = "Difference strings"; diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix index 53c416bef9b..b8fe0d25ed4 100644 --- a/pkgs/development/libraries/haskell/editline/default.nix +++ b/pkgs/development/libraries/haskell/editline/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, libedit }: +{ cabal, libedit }: cabal.mkDerivation (self: { pname = "editline"; version = "0.2.1.0"; sha256 = "83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1"; - buildDepends = [ Cabal ]; extraLibraries = [ libedit ]; meta = { homepage = "http://code.haskell.org/editline"; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index bcd4476dea8..2906b0a9e64 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec, ranges }: +{ cabal, parsec, ranges }: cabal.mkDerivation (self: { pname = "email-validate"; version = "0.2.8"; sha256 = "04cz1nm1zkb46kdxs43pmkxli2xm5nqlh951nn0mdgy6hqhkpkqd"; - buildDepends = [ Cabal parsec ranges ]; + buildDepends = [ parsec ranges ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 9c0cb75e415..e877124b963 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "entropy"; version = "0.2.1"; sha256 = "1qp8hvdzfgg2wk7d431qycwbn2zpzlplc1c7dbhimj1had5jscrs"; - buildDepends = [ Cabal ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; description = "A platform independent entropy source"; diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 33d7f295b77..b0e9f03a31b 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text, transformers }: +{ cabal, text, transformers }: cabal.mkDerivation (self: { pname = "enumerator"; version = "0.4.18"; sha256 = "0xqgcn3xs0i7kdy73lizfhs4dzj8crf2x9pmb9d37kqrhdgznl9d"; - buildDepends = [ Cabal text transformers ]; + buildDepends = [ text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; description = "Reliable, high-performance processing with left-fold enumerators"; diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix index 72aac851437..25d64b3faaf 100644 --- a/pkgs/development/libraries/haskell/erf/default.nix +++ b/pkgs/development/libraries/haskell/erf/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "erf"; version = "2.0.0.0"; sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14"; - buildDepends = [ Cabal ]; meta = { description = "The error function, erf, and related functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 708dcc0e1ef..2a95faafaf6 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, transformers }: +{ cabal, transformers }: cabal.mkDerivation (self: { pname = "explicit-exception"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal transformers ]; + buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Exception"; description = "Exceptions which are explicit in the type signature"; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix index 66f3a505091..8a928931e3e 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.0"; sha256 = "c252dc5a505332700f041d4e1fd3d309cde6158892f9c35339bf5e67bad7f781"; - buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix index 402dab01165..329bb2a42c4 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.2"; sha256 = "0rsdvb7k8mp88s1jjmna17qa6363vbjgvlkpncmn8516dnxhypg3"; - buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix index 82ce2f96d39..d349a1f17e3 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.3"; sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm"; - buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix index 8636659645b..f217db39bc6 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.4"; sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc"; - buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/failure/0.1.2.nix b/pkgs/development/libraries/haskell/failure/0.1.2.nix index c218d95c564..fc5c9488e59 100644 --- a/pkgs/development/libraries/haskell/failure/0.1.2.nix +++ b/pkgs/development/libraries/haskell/failure/0.1.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "failure"; version = "0.1.2"; sha256 = "14pwj0zb5kk2wadpddanxv3kr0hzklxhzbprmkh40yn1dbwgdas4"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; description = "A simple type class for success/failure computations"; diff --git a/pkgs/development/libraries/haskell/failure/0.2.0.nix b/pkgs/development/libraries/haskell/failure/0.2.0.nix index 4021482ae07..05b1b0c173c 100644 --- a/pkgs/development/libraries/haskell/failure/0.2.0.nix +++ b/pkgs/development/libraries/haskell/failure/0.2.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, transformers }: +{ cabal, transformers }: cabal.mkDerivation (self: { pname = "failure"; version = "0.2.0"; sha256 = "1z7q2ldgfm0khar3vx7paz0jigzd720xjq2s0x02qf2m3iv0ilcv"; - buildDepends = [ Cabal transformers ]; + buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; description = "A simple type class for success/failure computations"; diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 82e5bda7f3c..272cc735155 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, Cabal, filepath }: +{ cabal, blazeBuilder, filepath }: cabal.mkDerivation (self: { pname = "fast-logger"; version = "0.0.2"; sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7"; - buildDepends = [ blazeBuilder Cabal filepath ]; + buildDepends = [ blazeBuilder filepath ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index c54bd936388..f93da3ee549 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, transformers }: +{ cabal, mtl, transformers }: cabal.mkDerivation (self: { pname = "fclabels"; version = "1.1.0.2"; sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r"; - buildDepends = [ Cabal mtl transformers ]; + buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index 6da13fec632..8ad5c4318f7 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, utf8String, xml }: +{ cabal, utf8String, xml }: cabal.mkDerivation (self: { pname = "feed"; version = "0.3.8"; sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576"; - buildDepends = [ Cabal utf8String xml ]; + buildDepends = [ utf8String xml ]; meta = { description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix index 7041dd87f93..7299daddb14 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "fgl"; version = "5.4.2.2"; sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix index 488e8d2001a..7417a32745c 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "fgl"; version = "5.4.2.3"; sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix index ad0ce4f334b..7b6aa799944 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "fgl"; version = "5.4.2.4"; sha256 = "0rh22786f37mpsvhkv075wjh5sd0c83nlhk669xil9rd7swcr66f"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index d42cc848bd7..d24d30adfcb 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "file-embed"; version = "0.0.4.1"; sha256 = "156ydqljhxp16192s4pj6h8jcvrfmj2lnsvzy0zg394wi97bxpi2"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/snoyberg/file-embed/tree/master"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index ab047ef30c7..3511cddeee2 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "filepath"; version = "1.3.0.0"; sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; description = "Library for manipulating FilePaths in a cross platform way"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index d30338aae63..db441223843 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -1,14 +1,10 @@ -{ cabal, Cabal, Diff, filepath, parsec, split, time, utf8String -, xml -}: +{ cabal, Diff, filepath, parsec, split, time, utf8String, xml }: cabal.mkDerivation (self: { pname = "filestore"; version = "0.4.0.4"; sha256 = "14rp2689gjnk9pqk2xv4m3q3icgfvbik32c2d6gx4l2y7n78dsbx"; - buildDepends = [ - Cabal Diff filepath parsec split time utf8String xml - ]; + buildDepends = [ Diff filepath parsec split time utf8String xml ]; meta = { homepage = "http://johnmacfarlane.net/repos/filestore"; description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index 1fd1bf724a2..37f66a12ba6 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "fingertree"; version = "0.0.1.0"; sha256 = "e80bf256506290c8f4fb44222920ae7d8405fd22e453c7a08dba49297d49328b"; - buildDepends = [ Cabal ]; meta = { description = "Generic finger-tree structure, with example instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 94f78f01119..3c7e45ce0d5 100755 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, thExtras, transformers }: +{ cabal, thExtras, transformers }: cabal.mkDerivation (self: { pname = "flexible-defaults"; version = "0.0.0.3"; sha256 = "1s0dz61bqzzbxqvn9i8zwaccsha15als45zzjs2yc11r3m151dla"; - buildDepends = [ Cabal thExtras transformers ]; + buildDepends = [ thExtras transformers ]; meta = { homepage = "https://github.com/mokus0/flexible-defaults"; description = "Generate default function implementations for complex type classes"; diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index 9867983345e..60e93c81b94 100755 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "funcmp"; version = "1.5"; sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ filepath ]; meta = { homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 8c6ccc6b70e..2853fbca768 100755 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, continuedFractions, converge, vector }: +{ cabal, continuedFractions, converge, vector }: cabal.mkDerivation (self: { pname = "gamma"; version = "0.9.0.2"; sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; - buildDepends = [ Cabal continuedFractions converge vector ]; + buildDepends = [ continuedFractions converge vector ]; meta = { homepage = "https://github.com/mokus0/gamma"; description = "Gamma function and related functions"; diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix index 8e26e8b00cc..42de2748380 100644 --- a/pkgs/development/libraries/haskell/gd/default.nix +++ b/pkgs/development/libraries/haskell/gd/default.nix @@ -1,12 +1,9 @@ -{ cabal, Cabal, expat, fontconfig, freetype, gd, libjpeg, libpng -, zlib -}: +{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }: cabal.mkDerivation (self: { pname = "gd"; version = "3000.7.1"; sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50"; - buildDepends = [ Cabal ]; extraLibraries = [ expat fontconfig freetype gd libjpeg libpng zlib ]; diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix index 29d52225e15..929b717f552 100644 --- a/pkgs/development/libraries/haskell/gdiff/default.nix +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "gdiff"; version = "1.0"; sha256 = "35257b1090cf78f95d24c7a89920863c1d824652311fa5793693d7d06d96517b"; - buildDepends = [ Cabal ]; meta = { description = "Generic diff and patch"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 30e2ac7c0b2..b34c394cac7 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "generic-deriving"; version = "1.0.3"; sha256 = "0g5sw4m9qdr1l47zq15l6jk9ksz1nazssdxz7lrdqx6ib3xbrz6y"; - buildDepends = [ Cabal ]; meta = { description = "Generic programming library for generalized deriving"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix index 9f95976939a..ef1cf8401b4 100644 --- a/pkgs/development/libraries/haskell/ghc-core/default.nix +++ b/pkgs/development/libraries/haskell/ghc-core/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, colorizeHaskell, filepath, pcreLight }: +{ cabal, colorizeHaskell, filepath, pcreLight }: cabal.mkDerivation (self: { pname = "ghc-core"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1s68m2zkpz0n927rgzg0l0r5v8pk3z03rlkd82h83agw0hzb9ng7"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal colorizeHaskell filepath pcreLight ]; + buildDepends = [ colorizeHaskell filepath pcreLight ]; meta = { homepage = "http://code.haskell.org/~dons/code/ghc-core"; description = "Display GHC's core and assembly output in a pager"; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 9364944b3e0..31b6c32d304 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, Cabal, mtl }: +{ cabal, binary, mtl }: cabal.mkDerivation (self: { pname = "ghc-events"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0q1r5jxk8ma8rg65n4iixl5zyk4nxpzi4ywf0jz8y1nbbhbas7g2"; isLibrary = true; isExecutable = true; - buildDepends = [ binary Cabal mtl ]; + buildDepends = [ binary mtl ]; noHaddock = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index f9b97f83c97..d67f455471f 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, MonadCatchIOMtl, mtl }: +{ cabal, MonadCatchIOMtl, mtl }: cabal.mkDerivation (self: { pname = "ghc-mtl"; version = "1.0.1.1"; sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn"; - buildDepends = [ Cabal MonadCatchIOMtl mtl ]; + buildDepends = [ MonadCatchIOMtl mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/ghc-mtl"; description = "An mtl compatible version of the Ghc-Api monads and monad-transformers"; diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix index 60c7f9ced46..1fa7e662f02 100644 --- a/pkgs/development/libraries/haskell/ghc-paths/default.nix +++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "ghc-paths"; version = "0.1.0.8"; sha256 = "0mhc5zhbybp1vmkjsqbca51993vkpx5g8hql160m8m95apkc2wl6"; - buildDepends = [ Cabal ]; meta = { description = "Knowledge of GHC's installation directories"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index a6a5a47305d..ce2cb87c096 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, syb }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "ghc-syb-utils"; version = "0.2.1.0"; sha256 = "02wmd4zkng38z3bhsk4w4dqj1lzznhg2p0ijwr1a0dgx8cqr490z"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; description = "Scrap Your Boilerplate utilities for the GHC API"; diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix index 68b5c842234..d0a766940fe 100644 --- a/pkgs/development/libraries/haskell/ghc-syb/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "ghc-syb"; version = "0.2.0.0"; sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; description = "Data and Typeable instances for the GHC API"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 2259a19a23d..65aab04f914 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,8 +1,8 @@ -{ cabal, Cabal, cgi, ConfigFile, feed, filepath, filestore -, ghcPaths, happstackServer, happstackUtil, highlightingKate -, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc -, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, text -, time, url, utf8String, xhtml, xml, xssSanitize, zlib +{ cabal, cgi, ConfigFile, feed, filepath, filestore, ghcPaths +, happstackServer, happstackUtil, highlightingKate, hslogger +, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes +, parsec, random, recaptcha, safe, SHA, syb, text, time, url +, utf8String, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { @@ -12,11 +12,10 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal cgi ConfigFile feed filepath filestore ghcPaths - happstackServer happstackUtil highlightingKate hslogger - HStringTemplate HTTP json mtl network pandoc pandocTypes parsec - random recaptcha safe SHA syb text time url utf8String xhtml xml - xssSanitize zlib + cgi ConfigFile feed filepath filestore ghcPaths happstackServer + happstackUtil highlightingKate hslogger HStringTemplate HTTP json + mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb + text time url utf8String xhtml xml xssSanitize zlib ]; meta = { homepage = "http://gitit.net"; diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index 0aea2274383..f1bae4ad9fe 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade +{ cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade , pkgconfig }: @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { pname = "glade"; version = "0.12.1"; sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990"; - buildDepends = [ Cabal glib gtk ]; + buildDepends = [ glib gtk ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ gtkC libglade ]; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 21516fb9f65..c60c776e60f 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, glib, gtk2hsBuildtools, libc, pkgconfig }: +{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig }: cabal.mkDerivation (self: { pname = "glib"; version = "0.12.2"; sha256 = "0p1d6j23yf30824q5gn7pw7s47hs4rnaqs69d2hn2pnzpc1ml3c6"; - buildDepends = [ Cabal ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index dc25a6af204..8d9c42c1243 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -1,10 +1,10 @@ -{ cabal, bmp, Cabal, GLUT, OpenGL }: +{ cabal, bmp, GLUT, OpenGL }: cabal.mkDerivation (self: { pname = "gloss"; version = "1.6.1.1"; sha256 = "0y0npw27ic23zx7fq7dmvwbz2r62wblw9nbyai9kxgff4m2p3j4m"; - buildDepends = [ bmp Cabal GLUT OpenGL ]; + buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 8c7d7d20eaf..fe6119d5a6a 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, colour, dlist, extensibleExceptions, fgl, filepath +{ cabal, colour, dlist, extensibleExceptions, fgl, filepath , polyparse, text, transformers, wlPprintText }: @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal colour dlist extensibleExceptions fgl filepath polyparse text + colour dlist extensibleExceptions fgl filepath polyparse text transformers wlPprintText ]; meta = { diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index ddd808e9a44..346caa1b72e 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -1,12 +1,12 @@ -{ cabal, Cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl -, pango, pkgconfig +{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango +, pkgconfig }: cabal.mkDerivation (self: { pname = "gtk"; version = "0.12.2"; sha256 = "0qjhy2adbqv03qbmh6ydga4axvj263n5srwpfrw4v5gk34fvyj9w"; - buildDepends = [ Cabal cairo glib mtl pango ]; + buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib gtk ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 8a0bb262a3b..01d40a2a5ab 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, filepath, happy, random }: +{ cabal, alex, filepath, happy, random }: cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal filepath random ]; + buildDepends = [ filepath random ]; buildTools = [ alex happy ]; meta = { homepage = "http://projects.haskell.org/gtk2hs/"; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 960867b873a..7ab1b1eda71 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -1,12 +1,12 @@ -{ cabal, Cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc -, mtl, pkgconfig +{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl +, pkgconfig }: cabal.mkDerivation (self: { pname = "gtksourceview2"; version = "0.12.3"; sha256 = "0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd"; - buildDepends = [ Cabal glib gtk mtl ]; + buildDepends = [ glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ gtksourceview ]; diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix index 58bb2a61266..1f0f75ffeb8 100644 --- a/pkgs/development/libraries/haskell/hS3/default.nix +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, Crypto, dataenc, HTTP, hxt, MissingH, network -, random, regexCompat, utf8String +{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random +, regexCompat, utf8String }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal Crypto dataenc HTTP hxt MissingH network random regexCompat + Crypto dataenc HTTP hxt MissingH network random regexCompat utf8String ]; meta = { diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index e19111eb077..f6a3d26b24e 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, blazeHtml, Cabal, citeprocHs, cryptohash, filepath +{ cabal, binary, blazeHtml, citeprocHs, cryptohash, filepath , hamlet, mtl, pandoc, parsec, regexBase, regexTdfa, snapCore , snapServer, tagsoup, time }: @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { version = "3.2.6.1"; sha256 = "0chpg04rsp8lxzdj43wqs3wyc7i70hfi3raxdar6bhwxhfxgj4wn"; buildDepends = [ - binary blazeHtml Cabal citeprocHs cryptohash filepath hamlet mtl - pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup time + binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc + parsec regexBase regexTdfa snapCore snapServer tagsoup time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index e9ce8f939e9..c3cdf361217 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, blazeHtml, Cabal, failure, parsec -, shakespeare, text +{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare +, text }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.8"; sha256 = "1vlp8vwaipz757vnd95gcdi9dkrpbgfdlsb3kgjivsj7rqbmxf7z"; buildDepends = [ - blazeBuilder blazeHtml Cabal failure parsec shakespeare text + blazeBuilder blazeHtml failure parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix index 06fde8d35d8..6f39e82739d 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -1,5 +1,5 @@ -{ cabal, binary, Cabal, mtl, syb, sybWithClass -, sybWithClassInstancesText, text, time +{ cabal, binary, mtl, syb, sybWithClass, sybWithClassInstancesText +, text, time }: cabal.mkDerivation (self: { @@ -9,8 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary Cabal mtl syb sybWithClass sybWithClassInstancesText text - time + binary mtl syb sybWithClass sybWithClassInstancesText text time ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 97ec17f54fe..a0ec12802a0 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, hamlet, happstackServer, text }: +{ cabal, hamlet, happstackServer, text }: cabal.mkDerivation (self: { pname = "happstack-hamlet"; version = "6.2.3"; sha256 = "0k8g0rx9ikfklsrry2hxmm4hxwn31ra004qllpn6aldg6dr2w5n1"; - buildDepends = [ Cabal hamlet happstackServer text ]; + buildDepends = [ hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index ca7514fe129..ec3f63d1eaa 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,7 +1,6 @@ -{ cabal, blazeHtml, Cabal, extensibleExceptions, filepath -, happstackData, happstackUtil, hslogger, html, MaybeT, mtl -, network, parsec, sendfile, syb, text, time, utf8String, xhtml -, zlib +{ cabal, blazeHtml, extensibleExceptions, filepath, happstackData +, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec +, sendfile, syb, text, time, utf8String, xhtml, zlib }: cabal.mkDerivation (self: { @@ -11,9 +10,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml Cabal extensibleExceptions filepath happstackData - happstackUtil hslogger html MaybeT mtl network parsec sendfile syb - text time utf8String xhtml zlib + blazeHtml extensibleExceptions filepath happstackData happstackUtil + hslogger html MaybeT mtl network parsec sendfile syb text time + utf8String xhtml zlib ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index e0f5ba67342..f22664fa842 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, extensibleExceptions, filepath, hslogger, mtl -, network, parsec, random, time, unixCompat +{ cabal, extensibleExceptions, filepath, hslogger, mtl, network +, parsec, random, time, unixCompat }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal extensibleExceptions filepath hslogger mtl network parsec - random time unixCompat + extensibleExceptions filepath hslogger mtl network parsec random + time unixCompat ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index cc0c8b7e58c..0632472e6b6 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "hashable"; version = "1.1.2.3"; sha256 = "19v94b34c2j6f9d9xii2hg0mjxdkq51aifkcqw6hbicn97kfcxls"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index eefc5b87282..7d99cc4f6aa 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, Cabal, dataenc, extensibleExceptions, filepath -, mmap, mtl, zlib +{ cabal, binary, dataenc, extensibleExceptions, filepath, mmap, mtl +, zlib }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary Cabal dataenc extensibleExceptions filepath mmap mtl zlib + binary dataenc extensibleExceptions filepath mmap mtl zlib ]; meta = { description = "Hashed file storage support code"; diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index c314752970d..56b2316a5f9 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, hashable, primitive, vector }: +{ cabal, hashable, primitive, vector }: cabal.mkDerivation (self: { pname = "hashtables"; version = "1.0.1.2"; sha256 = "09lviwxwlhvhrgm7v66w0vd7j02s0191w1izsvwh1a3dj2vc7vw7"; - buildDepends = [ Cabal hashable primitive vector ]; + buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; description = "Mutable hash tables in the ST monad"; diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix index 2134d22e88e..acf6a6c0d4f 100644 --- a/pkgs/development/libraries/haskell/haskeline-class/default.nix +++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haskeline, mtl }: +{ cabal, haskeline, mtl }: cabal.mkDerivation (self: { pname = "haskeline-class"; version = "0.6.2"; sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl"; - buildDepends = [ Cabal haskeline mtl ]; + buildDepends = [ haskeline mtl ]; meta = { homepage = "http://community.haskell.org/~aslatter/code/haskeline-class"; description = "Class interface for working with Haskeline"; diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 51b853a14da..4e67ed5443a 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -1,5 +1,4 @@ -{ cabal, Cabal, extensibleExceptions, filepath, mtl, terminfo -, utf8String +{ cabal, extensibleExceptions, filepath, mtl, terminfo, utf8String }: cabal.mkDerivation (self: { @@ -7,7 +6,7 @@ cabal.mkDerivation (self: { version = "0.6.4.6"; sha256 = "136h71rb50sypkdbnk849mbcgfzx3y4hfxmx2c7kf90zpmsx5wmj"; buildDepends = [ - Cabal extensibleExceptions filepath mtl terminfo utf8String + extensibleExceptions filepath mtl terminfo utf8String ]; meta = { homepage = "http://trac.haskell.org/haskeline"; diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix index 74b20c01aaa..90c4a599bc4 100644 --- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix +++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "haskell-lexer"; version = "1.0"; sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86"; - buildDepends = [ Cabal ]; meta = { description = "A fully compliant Haskell 98 lexer"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix index f0648c65567..649bf29f58f 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, cpphs, happy }: +{ cabal, cpphs, happy }: cabal.mkDerivation (self: { pname = "haskell-src-exts"; version = "1.11.1"; sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6"; - buildDepends = [ Cabal cpphs ]; + buildDepends = [ cpphs ]; buildTools = [ happy ]; meta = { homepage = "http://code.haskell.org/haskell-src-exts"; diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 50bb2946e6a..180c84f6519 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haskellSrcExts, syb, thLift, uniplate }: +{ cabal, haskellSrcExts, syb, thLift, uniplate }: cabal.mkDerivation (self: { pname = "haskell-src-meta"; version = "0.5.1"; sha256 = "1wpddllq651vnsibhi0m7agc6ygj95646k29v0xl75nmfb034lz3"; - buildDepends = [ Cabal haskellSrcExts syb thLift uniplate ]; + buildDepends = [ haskellSrcExts syb thLift uniplate ]; meta = { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix index c9ec5a30fe2..0bec7376544 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, happy }: +{ cabal, happy }: cabal.mkDerivation (self: { pname = "haskell-src"; version = "1.0.1.3"; sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89"; - buildDepends = [ Cabal ]; buildTools = [ happy ]; meta = { description = "Manipulating Haskell source code"; diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix index fd0f5e16fe0..949efadea96 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, happy, syb }: +{ cabal, happy, syb }: cabal.mkDerivation (self: { pname = "haskell-src"; version = "1.0.1.4"; sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; buildTools = [ happy ]; meta = { description = "Support for manipulating Haskell source code"; diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix index 77e6e566ba2..dd62d57a02a 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, happy, syb }: +{ cabal, happy, syb }: cabal.mkDerivation (self: { pname = "haskell-src"; version = "1.0.1.5"; sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; buildTools = [ happy ]; meta = { description = "Support for manipulating Haskell source code"; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index 67419bb08d0..63cdbd31583 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, Cabal, filepath, ieee754, mtl, syb, text +{ cabal, blazeBuilder, filepath, ieee754, mtl, syb, text , utf8String }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.3.3"; sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772"; buildDepends = [ - blazeBuilder Cabal filepath ieee754 mtl syb text utf8String + blazeBuilder filepath ieee754 mtl syb text utf8String ]; meta = { homepage = "http://github.com/lymar/hastache"; diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix index af95878aca0..83917cf8891 100644 --- a/pkgs/development/libraries/haskell/haxr-th/default.nix +++ b/pkgs/development/libraries/haskell/haxr-th/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haxr }: +{ cabal, haxr }: cabal.mkDerivation (self: { pname = "haxr-th"; version = "3000.5"; sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif"; - buildDepends = [ Cabal haxr ]; + buildDepends = [ haxr ]; meta = { homepage = "http://www.haskell.org/haxr/"; description = "Automatic deriving of XML-RPC structs for Haskell records"; diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 1191d6b7411..5caea80d6c8 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, Cabal, dataenc, HaXml, HTTP, mtl, network -, time, utf8String +{ cabal, blazeBuilder, dataenc, HaXml, HTTP, mtl, network, time +, utf8String }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "3000.8.5"; sha256 = "1gfifqc7ldklapnymwd9ss0lll6q87sbg1hc6pa4c9sh275x1rz6"; buildDepends = [ - blazeBuilder Cabal dataenc HaXml HTTP mtl network time utf8String + blazeBuilder dataenc HaXml HTTP mtl network time utf8String ]; meta = { homepage = "http://www.haskell.org/haskellwiki/HaXR"; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 9a9413b222e..e01adbcf428 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -1,5 +1,4 @@ -{ cabal, blazeHtml, Cabal, filepath, mtl, parsec, regexPcreBuiltin -}: +{ cabal, blazeHtml, filepath, mtl, parsec, regexPcreBuiltin }: cabal.mkDerivation (self: { pname = "highlighting-kate"; @@ -7,9 +6,7 @@ cabal.mkDerivation (self: { sha256 = "005k3yc406h4wz5jk47nk4g5qb409kd7dwyw7n9g31gjqxp73p8v"; isLibrary = true; isExecutable = true; - buildDepends = [ - blazeHtml Cabal filepath mtl parsec regexPcreBuiltin - ]; + buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; meta = { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index d4a8036e88b..7c6dabf8085 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, extensibleExceptions, filepath, ghcMtl, ghcPaths +{ cabal, extensibleExceptions, filepath, ghcMtl, ghcPaths , haskellSrc, MonadCatchIOMtl, mtl, random, utf8String }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.3.3.4"; sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy"; buildDepends = [ - Cabal extensibleExceptions filepath ghcMtl ghcPaths haskellSrc + extensibleExceptions filepath ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String ]; meta = { diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index ff2225a8078..588a6006f7e 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, Cabal, languageJavascript, text }: +{ cabal, blazeBuilder, languageJavascript, text }: cabal.mkDerivation (self: { pname = "hjsmin"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k"; isLibrary = true; isExecutable = true; - buildDepends = [ blazeBuilder Cabal languageJavascript text ]; + buildDepends = [ blazeBuilder languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; description = "Haskell implementation of a javascript minifier"; diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 525fd822dcd..4d9186ce1c5 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, cmdargs, filepath, HUnit, mtl, parsec, regexpr -, safe, split, time, utf8String +{ cabal, cmdargs, filepath, HUnit, mtl, parsec, regexpr, safe +, split, time, utf8String }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.17"; sha256 = "0dlm3hjbcf48nzz597ag1q9y0phsc09062wvzpmfkhk4hsijpds4"; buildDepends = [ - Cabal cmdargs filepath HUnit mtl parsec regexpr safe split time + cmdargs filepath HUnit mtl parsec regexpr safe split time utf8String ]; meta = { diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix index 386560d96aa..0a6dd1cf202 100644 --- a/pkgs/development/libraries/haskell/hledger-vty/default.nix +++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix @@ -1,6 +1,4 @@ -{ cabal, Cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time -, vty -}: +{ cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time, vty }: cabal.mkDerivation (self: { pname = "hledger-vty"; @@ -8,9 +6,7 @@ cabal.mkDerivation (self: { sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188"; isLibrary = false; isExecutable = true; - buildDepends = [ - Cabal cmdargs hledger hledgerLib HUnit safe time vty - ]; + buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ]; meta = { homepage = "http://hledger.org"; description = "A curses-style console interface for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 7fd0c6c72d1..4e032d45226 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,7 +1,7 @@ -{ cabal, aeson, blazeHtml, Cabal, cabalFileTh, clientsession -, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, filepath -, hamlet, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr -, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time +{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs +, dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet +, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe +, shakespeareCss, shakespeareJs, shakespeareText, text, time , transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm , yesodJson, yesodStatic }: @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - aeson blazeHtml Cabal cabalFileTh clientsession cmdargs dataObject + aeson blazeHtml cabalFileTh clientsession cmdargs dataObject dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs shakespeareText text time transformers wai waiExtra warp yesod diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index e8d2c9ac5c5..1b53fd04a05 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,6 +1,5 @@ -{ cabal, Cabal, cabalFileTh, cmdargs, csv, filepath, haskeline -, hledgerLib, HUnit, mtl, parsec, regexpr, safe, split, time -, utf8String +{ cabal, cabalFileTh, cmdargs, csv, filepath, haskeline, hledgerLib +, HUnit, mtl, parsec, regexpr, safe, split, time, utf8String }: cabal.mkDerivation (self: { @@ -10,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal cabalFileTh cmdargs csv filepath haskeline hledgerLib HUnit - mtl parsec regexpr safe split time utf8String + cabalFileTh cmdargs csv filepath haskeline hledgerLib HUnit mtl + parsec regexpr safe split time utf8String ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 06ec278e0ec..0248f3289b8 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -1,12 +1,10 @@ -{ cabal, binary, blas, Cabal, gsl, liblapack, storableComplex -, vector -}: +{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }: cabal.mkDerivation (self: { pname = "hmatrix"; version = "0.13.1.0"; sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp"; - buildDepends = [ binary Cabal storableComplex vector ]; + buildDepends = [ binary storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; meta = { homepage = "http://perception.inf.um.es/hmatrix"; diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix index 2f2e72059a1..fec3f5dccf4 100644 --- a/pkgs/development/libraries/haskell/hopenssl/default.nix +++ b/pkgs/development/libraries/haskell/hopenssl/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, openssl }: +{ cabal, mtl, openssl }: cabal.mkDerivation (self: { pname = "hopenssl"; version = "1.6.1"; sha256 = "75ba42c5e9b02c09057c5aa25f577bdfe5214533fbd2921ac555897ade85958a"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; extraLibraries = [ openssl ]; meta = { homepage = "http://gitorious.org/hopenssl"; diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix index 52caa9cdcee..69653ca2699 100644 --- a/pkgs/development/libraries/haskell/hostname/default.nix +++ b/pkgs/development/libraries/haskell/hostname/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "hostname"; version = "1.0"; sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv"; - buildDepends = [ Cabal ]; meta = { description = "A very simple package providing a cross-platform means of determining the hostname"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix index 045c8678f65..4ed3ae9948a 100644 --- a/pkgs/development/libraries/haskell/hp2any-core/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, Cabal, filepath, network, time }: +{ cabal, attoparsec, filepath, network, time }: cabal.mkDerivation (self: { pname = "hp2any-core"; version = "0.11.1"; sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546"; - buildDepends = [ attoparsec Cabal filepath network time ]; + buildDepends = [ attoparsec filepath network time ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Heap profiling helper library"; diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index 5dbb580bd17..340def04cd8 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, freeglut, GLUT, hp2anyCore, mesa, network +{ cabal, filepath, freeglut, GLUT, hp2anyCore, mesa, network , OpenGL, parseargs }: @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal filepath GLUT hp2anyCore network OpenGL parseargs + filepath GLUT hp2anyCore network OpenGL parseargs ]; extraLibraries = [ freeglut mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index d89b48ae8e5..ebba81acf4f 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, syb }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "hs-bibutils"; version = "4.12"; sha256 = "0akxi69as7k5c0955yla9wcl1xvcvgzpzy3p1jj781w1lf89p537"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; meta = { homepage = "http://code.haskell.org/hs-bibutils"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix index e8db094f9a4..9992faf048c 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/libraries/haskell/hscolour/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "hscolour"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "17wzd1b7kd4di7djj8d203rn6r1zvd6rykpxhqv7j06kzgx2r7bz"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~malcolm/hscolour/"; description = "Colourise Haskell code"; diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index ba9b033ff36..2a83df47f09 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -1,10 +1,10 @@ -{ cabal, adns, Cabal, network }: +{ cabal, adns, network }: cabal.mkDerivation (self: { pname = "hsdns"; version = "1.5"; sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399"; - buildDepends = [ Cabal network ]; + buildDepends = [ network ]; extraLibraries = [ adns ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index fbf35824d16..3ba0249c4df 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec }: +{ cabal, mtl, parsec }: cabal.mkDerivation (self: { pname = "hsemail"; version = "1.7.1"; sha256 = "0059015ab93d5facf6060404984a295090ebfc667ae5b84b283163e126805a9e"; - buildDepends = [ Cabal mtl parsec ]; + buildDepends = [ mtl parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; description = "Internet Message Parsers"; diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix index 31de0b7575f..4ee2f0e75df 100644 --- a/pkgs/development/libraries/haskell/hslogger-template/default.nix +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, hslogger, mtl }: +{ cabal, hslogger, mtl }: cabal.mkDerivation (self: { pname = "hslogger-template"; version = "2.0.0"; sha256 = "1x8c132ckxjhnhlrnm92h0hkalkrgcc91cn73kv9kvcwy9b2fqcr"; - buildDepends = [ Cabal hslogger mtl ]; + buildDepends = [ hslogger mtl ]; meta = { description = "Automatic generation of hslogger functions"; license = self.stdenv.lib.licenses.publicDomain; diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix index 9ac0ec4a5f7..c1ee264ea84 100644 --- a/pkgs/development/libraries/haskell/hspread/default.nix +++ b/pkgs/development/libraries/haskell/hspread/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, Cabal, extensibleExceptions, network }: +{ cabal, binary, extensibleExceptions, network }: cabal.mkDerivation (self: { pname = "hspread"; version = "0.3.3"; sha256 = "6e8a9ecc1a6b1cc767aa188e2f4c04b77b321fd14000cac8f71dd6a7b82afbfc"; - buildDepends = [ binary Cabal extensibleExceptions network ]; + buildDepends = [ binary extensibleExceptions network ]; meta = { description = "A client library for the spread toolkit"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index c5359080ef7..baa19065041 100755 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "hsyslog"; version = "1.4"; sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db"; - buildDepends = [ Cabal ]; meta = { homepage = "http://gitorious.org/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001."; diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix index 65bfe35c370..f420bad2959 100644 --- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix +++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "html"; version = "1.0.1.2"; sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061"; - buildDepends = [ Cabal ]; meta = { description = "HTML combinator library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 3fc5ce16248..6621f13df8e 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,9 +1,9 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring -, blazeBuilder, blazeBuilderConduit, Cabal, caseInsensitive -, certificate, conduit, cookie, cprngAes, dataDefault, failure -, httpTypes, liftedBase, monadControl, mtl, network, regexCompat -, socks, text, time, tls, tlsExtra, transformers, transformersBase -, utf8String, zlibConduit +, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate +, conduit, cookie, cprngAes, dataDefault, failure, httpTypes +, liftedBase, monadControl, mtl, network, regexCompat, socks, text +, time, tls, tlsExtra, transformers, transformersBase, utf8String +, zlibConduit }: cabal.mkDerivation (self: { @@ -12,10 +12,10 @@ cabal.mkDerivation (self: { sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder - blazeBuilderConduit Cabal caseInsensitive certificate conduit - cookie cprngAes dataDefault failure httpTypes liftedBase - monadControl mtl network regexCompat socks text time tls tlsExtra - transformers transformersBase utf8String zlibConduit + blazeBuilderConduit caseInsensitive certificate conduit cookie + cprngAes dataDefault failure httpTypes liftedBase monadControl mtl + network regexCompat socks text time tls tlsExtra transformers + transformersBase utf8String zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index 551fd912211..1fbcc40a814 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, Cabal }: +{ cabal, attoparsec }: cabal.mkDerivation (self: { pname = "http-date"; version = "0.0.1"; sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd"; - buildDepends = [ attoparsec Cabal ]; + buildDepends = [ attoparsec ]; meta = { description = "HTTP Date parser/formatter"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 4890f5e3292..25346362b88 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -1,5 +1,5 @@ { cabal, asn1Data, attoparsec, attoparsecEnumerator -, base64Bytestring, blazeBuilder, blazeBuilderEnumerator, Cabal +, base64Bytestring, blazeBuilder, blazeBuilderEnumerator , caseInsensitive, certificate, cprngAes, dataDefault, enumerator , failure, httpTypes, monadControl, network, tls, tlsExtra , transformers, utf8String, zlibEnum @@ -13,9 +13,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ asn1Data attoparsec attoparsecEnumerator base64Bytestring - blazeBuilder blazeBuilderEnumerator Cabal caseInsensitive - certificate cprngAes dataDefault enumerator failure httpTypes - monadControl network tls tlsExtra transformers utf8String zlibEnum + blazeBuilder blazeBuilderEnumerator caseInsensitive certificate + cprngAes dataDefault enumerator failure httpTypes monadControl + network tls tlsExtra transformers utf8String zlibEnum ]; meta = { homepage = "http://github.com/snoyberg/http-enumerator"; diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 5c49527b116..0c7f78c65c2 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, Cabal, caseInsensitive, text }: +{ cabal, blazeBuilder, caseInsensitive, text }: cabal.mkDerivation (self: { pname = "http-types"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1dkp2iqqalrm381vagw65bhjnm80hv02h28447lmjl2j60b4mby0"; isLibrary = true; isExecutable = true; - buildDepends = [ blazeBuilder Cabal caseInsensitive text ]; + buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index 19bf6736ff5..e56a95437db 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, network }: +{ cabal, network }: cabal.mkDerivation (self: { pname = "httpd-shed"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "c03f784742bdc3053c7e867e587ee859a9a3adaa082d36bdb2ea69da1b02069f"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal network ]; + buildDepends = [ network ]; meta = { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix index 8b104f1fb6c..9e2b9a21bb3 100644 --- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix +++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "hxt-charproperties"; version = "9.1.1"; sha256 = "14xv0q1hh0k8lgispc4fa49cvyg9s7936kp42vr9b0pyd1q4zid8"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Character properties and classes for XML and Unicode"; diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index ccd68b6b08d..c18bdea3875 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, hxtCharproperties, parsec }: +{ cabal, hxtCharproperties, parsec }: cabal.mkDerivation (self: { pname = "hxt-regex-xmlschema"; version = "9.0.4"; sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf"; - buildDepends = [ Cabal hxtCharproperties parsec ]; + buildDepends = [ hxtCharproperties parsec ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; description = "A regular expression library for W3C XML Schema regular expressions"; diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix index 4dd6f195ee7..6584a69b4ba 100644 --- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix +++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, hxtCharproperties }: +{ cabal, hxtCharproperties }: cabal.mkDerivation (self: { pname = "hxt-unicode"; version = "9.0.2"; sha256 = "1ri3198j0bavgam861yiiisl43rh4pbkmji7g6v3jnnch7834hdd"; - buildDepends = [ Cabal hxtCharproperties ]; + buildDepends = [ hxtCharproperties ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"; diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 15e488d4577..3b7a197c49e 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, Cabal, deepseq, filepath, HUnit, hxtCharproperties +{ cabal, binary, deepseq, filepath, HUnit, hxtCharproperties , hxtRegexXmlschema, hxtUnicode, mtl, network, parsec }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "9.2.0"; sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc"; buildDepends = [ - binary Cabal deepseq filepath HUnit hxtCharproperties - hxtRegexXmlschema hxtUnicode mtl network parsec + binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema + hxtUnicode mtl network parsec ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix index a2c88adefe4..3a731c62623 100644 --- a/pkgs/development/libraries/haskell/ieee754/default.nix +++ b/pkgs/development/libraries/haskell/ieee754/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "ieee754"; version = "0.7.3"; sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 7023bc12daf..2a51e8d344b 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, syb }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "instant-generics"; version = "0.3.4"; sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix index 26eedf5b94f..55b88ac1d36 100644 --- a/pkgs/development/libraries/haskell/io-storage/default.nix +++ b/pkgs/development/libraries/haskell/io-storage/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "io-storage"; version = "0.3"; sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/willdonnelly/io-storage"; description = "A key-value store in the IO monad"; diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index 1e6379b1543..c7e222e1d14 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec }: +{ cabal, parsec }: cabal.mkDerivation (self: { pname = "irc"; version = "0.5.0.0"; sha256 = "0bid9iqgrppkl7hl1cd2m1pvvk5qva53fqfl0v5ld52j904c50sr"; - buildDepends = [ Cabal parsec ]; + buildDepends = [ parsec ]; meta = { description = "A small library for parsing IRC messages"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index ee53c99c6e4..670055a7dec 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -1,5 +1,4 @@ -{ cabal, Cabal, ListLike, MonadCatchIOTransformers, parallel -, transformers +{ cabal, ListLike, MonadCatchIOTransformers, parallel, transformers }: cabal.mkDerivation (self: { @@ -9,7 +8,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal ListLike MonadCatchIOTransformers parallel transformers + ListLike MonadCatchIOTransformers parallel transformers ]; meta = { homepage = "http://www.tiresiaspress.us/haskell/iteratee"; diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix index 8d580993eee..a7fc6b7e6e1 100644 --- a/pkgs/development/libraries/haskell/ivor/default.nix +++ b/pkgs/development/libraries/haskell/ivor/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, Cabal, mtl, parsec }: +{ cabal, binary, mtl, parsec }: cabal.mkDerivation (self: { pname = "ivor"; version = "0.1.14.1"; sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych"; - buildDepends = [ binary Cabal mtl parsec ]; + buildDepends = [ binary mtl parsec ]; meta = { homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/"; description = "Theorem proving library based on dependent type theory"; diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix index 7dec5d03665..872f2fb394f 100644 --- a/pkgs/development/libraries/haskell/jpeg/default.nix +++ b/pkgs/development/libraries/haskell/jpeg/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "jpeg"; version = "0.0.1"; sha256 = "848e047cfec5781a28f472e9cd27d016362211d88dd6adb4f826c37d29d8bba6"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { description = "A library for decoding JPEG files written in pure Haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix index 6190e6e3f6f..1e4629166fa 100644 --- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix +++ b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeBuilderEnumerator, Cabal, enumerator +{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator , jsonTypes, text, transformers }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.0.1.2"; sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d"; buildDepends = [ - blazeBuilder blazeBuilderEnumerator Cabal enumerator jsonTypes text + blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix index 04af2f7a1a2..44be8624a41 100644 --- a/pkgs/development/libraries/haskell/jsonTypes/default.nix +++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "json-types"; version = "0.1"; sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { description = "Basic types for representing JSON"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index 33516b5c23d..d0ecb017dba 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haskellSrcExts, regexPosix }: +{ cabal, haskellSrcExts, regexPosix }: cabal.mkDerivation (self: { pname = "language-haskell-extract"; version = "0.2.1"; sha256 = "0lmg16g3z8cx0vb037bk4j2nr3qvybfcqfsr8l6jk57b2nz3yhbf"; - buildDepends = [ Cabal haskellSrcExts regexPosix ]; + buildDepends = [ haskellSrcExts regexPosix ]; meta = { homepage = "http://github.com/finnsson/template-helper"; description = "Module to automatically extract functions from the local code"; diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index c9cbb689862..b03f3b0f1da 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, happy, mtl, utf8Light }: +{ cabal, alex, happy, mtl, utf8Light }: cabal.mkDerivation (self: { pname = "language-javascript"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "19a8c8bq4s533iyb6h3vl59dnya6d7inaqk1hbhnlil1w2d0n5b5"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal mtl utf8Light ]; + buildDepends = [ mtl utf8Light ]; buildTools = [ alex happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index c568ba26b78..d6716abe55f 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "largeword"; version = "1.0.1"; sha256 = "0kkkck220wap3ad2k6461ylhshiqbizv0qh35i2325fhqx892gyr"; - buildDepends = [ Cabal ]; meta = { homepage = "http://trac.haskell.org/largeword/wiki"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix index 6c6637b9c2c..75059e70512 100644 --- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix +++ b/pkgs/development/libraries/haskell/leksah/process-leksah.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "process-leksah"; version = "1.0.1.4"; sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ filepath ]; meta = { description = "Process libraries"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 5369e1a70c6..65b58c19ed5 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, mtl, network, time, utf8String }: +{ cabal, filepath, mtl, network, time, utf8String }: cabal.mkDerivation (self: { pname = "libmpd"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "109bm5fgwmydh3bi93wxr6ac3gkp7pcvp4a8z226c1wlgc995zap"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath mtl network time utf8String ]; + buildDepends = [ filepath mtl network time utf8String ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; description = "An MPD client library"; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index c148629b540..255570f6c6e 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -1,12 +1,11 @@ -{ cabal, baseUnicodeSymbols, Cabal, monadControl, transformersBase -}: +{ cabal, baseUnicodeSymbols, monadControl, transformersBase }: cabal.mkDerivation (self: { pname = "lifted-base"; version = "0.1.0.3"; sha256 = "1fk2jv8xwjb4xmzcx7h74nh14i3wf5mpifiki9rvq4hnrb7gdx36"; buildDepends = [ - baseUnicodeSymbols Cabal monadControl transformersBase + baseUnicodeSymbols monadControl transformersBase ]; meta = { homepage = "https://github.com/basvandijk/lifted-base"; diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix index aa101ff1c87..5f438fb4060 100644 --- a/pkgs/development/libraries/haskell/logfloat/default.nix +++ b/pkgs/development/libraries/haskell/logfloat/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "logfloat"; version = "0.12.1"; sha256 = "1k13jjqv4df341hcj9hzrlisfx9wrsmyqvzi6ricx341d9z4ch05"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index d649886495d..266ffcd30f7 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, erf, vector }: +{ cabal, erf, vector }: cabal.mkDerivation (self: { pname = "math-functions"; version = "0.1.1.0"; sha256 = "0qb0hbfzd1g8cz3dkm8cs2wknz08b63vn7nljmynk794y64b1klp"; - buildDepends = [ Cabal erf vector ]; + buildDepends = [ erf vector ]; meta = { homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index 7dd0904a589..1344f7759af 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec, text }: +{ cabal, parsec, text }: cabal.mkDerivation (self: { pname = "maude"; version = "0.3.0"; sha256 = "1z9bk4fzkbfiqqx4mv4cdlckchvcli2gcp40d04ravvj7x6yaghg"; - buildDepends = [ Cabal parsec text ]; + buildDepends = [ parsec text ]; meta = { homepage = "https://github.com/davidlazar/maude-hs"; description = "An interface to the Maude rewriting system"; diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix index 0d77b382048..3153bb6f608 100644 --- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix +++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, random }: +{ cabal, random }: cabal.mkDerivation (self: { pname = "mersenne-random-pure64"; version = "0.2.0.3"; sha256 = "0cyjfdl17n5al04vliykx0m7zncqh3201vn9b9fqfqqpmm61grqz"; - buildDepends = [ Cabal random ]; + buildDepends = [ random ]; meta = { homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 265e48945f5..7838afc6756 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,13 +1,11 @@ -{ cabal, base64Bytestring, blazeBuilder, Cabal, filepath, random -, text -}: +{ cabal, base64Bytestring, blazeBuilder, filepath, random, text }: cabal.mkDerivation (self: { pname = "mime-mail"; version = "0.4.1.1"; sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4"; buildDepends = [ - base64Bytestring blazeBuilder Cabal filepath random text + base64Bytestring blazeBuilder filepath random text ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix index bdb6a5b50c7..817cae52295 100644 --- a/pkgs/development/libraries/haskell/mmap/default.nix +++ b/pkgs/development/libraries/haskell/mmap/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "mmap"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0f08x9kmv3a03kz5a6dpxr30nks55cs9sp55qpn2jnw31qx6hg6p"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { description = "Memory mapped files for POSIX and Windows"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix index 94dc55e852b..b3d9208bd25 100644 --- a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols, Cabal, transformers }: +{ cabal, baseUnicodeSymbols, transformers }: cabal.mkDerivation (self: { pname = "monad-control"; version = "0.2.0.3"; sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh"; - buildDepends = [ baseUnicodeSymbols Cabal transformers ]; + buildDepends = [ baseUnicodeSymbols transformers ]; meta = { homepage = "https://github.com/basvandijk/monad-control/"; description = "Lift control operations, like exception catching, through monad transformers"; diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix index 00950682e22..bf4ca6d0042 100644 --- a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix +++ b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix @@ -1,12 +1,11 @@ -{ cabal, baseUnicodeSymbols, Cabal, transformers, transformersBase -}: +{ cabal, baseUnicodeSymbols, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "monad-control"; version = "0.3.1"; sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45"; buildDepends = [ - baseUnicodeSymbols Cabal transformers transformersBase + baseUnicodeSymbols transformers transformersBase ]; meta = { homepage = "https://github.com/basvandijk/monad-control"; diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix index b233bcea007..669df22a951 100644 --- a/pkgs/development/libraries/haskell/monad-loops/default.nix +++ b/pkgs/development/libraries/haskell/monad-loops/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, stm }: +{ cabal, stm }: cabal.mkDerivation (self: { pname = "monad-loops"; version = "0.3.1.1"; sha256 = "086aqd1x1xc6irp24z1lwhzrknw9r2wbs8fnxz6vyi75m3rqvdcv"; - buildDepends = [ Cabal stm ]; + buildDepends = [ stm ]; meta = { homepage = "http://code.haskell.org/~mokus/monad-loops"; description = "Monadic loops"; diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix index 806c11a3e11..e8a2e298c98 100644 --- a/pkgs/development/libraries/haskell/monad-par/default.nix +++ b/pkgs/development/libraries/haskell/monad-par/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq, HUnit }: +{ cabal, deepseq, HUnit }: cabal.mkDerivation (self: { pname = "monad-par"; version = "0.1.0.3"; sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg"; - buildDepends = [ Cabal deepseq HUnit ]; + buildDepends = [ deepseq HUnit ]; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix index 02838ab4d88..670b6aaf79b 100644 --- a/pkgs/development/libraries/haskell/monad-peel/default.nix +++ b/pkgs/development/libraries/haskell/monad-peel/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, transformers }: +{ cabal, extensibleExceptions, transformers }: cabal.mkDerivation (self: { pname = "monad-peel"; version = "0.1"; sha256 = "0q56hdjgbj7ykpjx5z8qlqqkngmgm5wzm9vwcd7v675k2ywcl3ys"; - buildDepends = [ Cabal extensibleExceptions transformers ]; + buildDepends = [ extensibleExceptions transformers ]; meta = { homepage = "http://andersk.mit.edu/haskell/monad-peel/"; description = "Lift control operations like exception catching through monad transformers"; diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 97e28fdfb2f..374521d36c5 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, bson, Cabal, cryptohash, liftedBase, monadControl -, mtl, network, parsec, random, randomShuffle, transformersBase +{ cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl +, network, parsec, random, randomShuffle, transformersBase }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "1.2.0"; sha256 = "0rffa13p889mxbbkj2bmqy3yada3mrhngvp8pp7qvrll1acm7s13"; buildDepends = [ - binary bson Cabal cryptohash liftedBase monadControl mtl network - parsec random randomShuffle transformersBase + binary bson cryptohash liftedBase monadControl mtl network parsec + random randomShuffle transformersBase ]; meta = { homepage = "http://github.com/TonyGen/mongoDB-haskell"; diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix index 063c8736328..31dd91a2d2f 100644 --- a/pkgs/development/libraries/haskell/mpppc/default.nix +++ b/pkgs/development/libraries/haskell/mpppc/default.nix @@ -1,10 +1,10 @@ -{ cabal, ansiTerminal, Cabal, split, text }: +{ cabal, ansiTerminal, split, text }: cabal.mkDerivation (self: { pname = "mpppc"; version = "0.1.2"; sha256 = "1zms71wx5a6rd60xy1pv6g1kxlx0hzh36pbr5a5lkfflc583z1k5"; - buildDepends = [ ansiTerminal Cabal split text ]; + buildDepends = [ ansiTerminal split text ]; meta = { description = "Multi-dimensional parametric pretty-printer with color"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix index 174b3b2902a..d609fc75cd7 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "mtl"; version = "1.1.0.2"; sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; - buildDepends = [ Cabal ]; meta = { description = "Monad transformer library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix index 7f47ea5b444..05e84b90dd0 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "mtl"; version = "1.1.1.1"; sha256 = "157gbrgrg0l9r72nq45dkach53yncysif4qglsaql28g37djc4x6"; - buildDepends = [ Cabal ]; meta = { description = "Monad transformer library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix index 8024c76c4c5..dc2ddedc121 100644 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, transformers }: +{ cabal, transformers }: cabal.mkDerivation (self: { pname = "mtl"; version = "2.0.1.0"; sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk"; - buildDepends = [ Cabal transformers ]; + buildDepends = [ transformers ]; meta = { description = "Monad classes, using functional dependencies"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix index 3f9b240fb37..349fea712eb 100644 --- a/pkgs/development/libraries/haskell/mtlparse/default.nix +++ b/pkgs/development/libraries/haskell/mtlparse/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "mtlparse"; version = "0.1.2"; sha256 = "cd85d985e4eff842b1c053a2ff507094a20995c5757acc06ea34ff07d9edd142"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/"; description = "parse library using mtl package"; diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 9acb58bc959..5f12e4cee92 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, explicitException, QuickCheck, text, transformers +{ cabal, explicitException, QuickCheck, text, transformers , utf8String }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.0.0"; sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g"; buildDepends = [ - Cabal explicitException QuickCheck text transformers utf8String + explicitException QuickCheck text transformers utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index 6680be9d579..13059f0183e 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, transformers }: +{ cabal, transformers }: cabal.mkDerivation (self: { pname = "multiplate"; version = "0.0.1.1"; sha256 = "00rxgkvgx1rfvk15gjyyg00vqyg4j24d8d19q6rj07j2mgfvdxw6"; - buildDepends = [ Cabal transformers ]; + buildDepends = [ transformers ]; meta = { homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index b98ae57572c..c001783a13b 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "multirec"; version = "0.7.1"; sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph"; - buildDepends = [ Cabal ]; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix index 995e573f3e5..eb5df93d5bc 100644 --- a/pkgs/development/libraries/haskell/multiset/default.nix +++ b/pkgs/development/libraries/haskell/multiset/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "multiset"; version = "0.2.1"; sha256 = "0snlm6s9ikf5gngdwb7rm7v6017f5bffajv6777y56pjmd7bk9sy"; - buildDepends = [ Cabal ]; meta = { description = "The Data.MultiSet container type"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix index 1f5a48e333a..d20822244ef 100644 --- a/pkgs/development/libraries/haskell/murmur-hash/default.nix +++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "murmur-hash"; version = "0.1.0.5"; sha256 = "1m7rm57bxkrl4i9fbvmx5m29axyxddrs4ss7plbd19pw3wsvgmr0"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/nominolo/murmur-hash"; description = "MurmurHash2 implementation for Haskell"; diff --git a/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix b/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix index f6219dbfecb..ab762c2db63 100644 --- a/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, primitive, time, vector }: +{ cabal, primitive, time, vector }: cabal.mkDerivation (self: { pname = "mwc-random"; version = "0.10.0.1"; sha256 = "0mmkl90rf57f2rxg3y2nibd37l9mwr2j4c71bwyvxqzfk7cylw9b"; - buildDepends = [ Cabal primitive time vector ]; + buildDepends = [ primitive time vector ]; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix b/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix index faede83bb6f..5cf459fb0a9 100644 --- a/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix +++ b/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, primitive, time, vector }: +{ cabal, primitive, time, vector }: cabal.mkDerivation (self: { pname = "mwc-random"; version = "0.11.0.0"; sha256 = "1yqi472m3snx71fvd4mig6my74rkpf3sbsdcmx2y2l00cyk79ghh"; - buildDepends = [ Cabal primitive time vector ]; + buildDepends = [ primitive time vector ]; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix index f16315c967f..e5b3e6a8c48 100644 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ b/pkgs/development/libraries/haskell/neither/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, failure, transformers }: +{ cabal, failure, transformers }: cabal.mkDerivation (self: { pname = "neither"; version = "0.3.1"; sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk"; - buildDepends = [ Cabal failure transformers ]; + buildDepends = [ failure transformers ]; meta = { homepage = "http://github.com/snoyberg/neither"; description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix index 313bddd84cb..7d99df9ee1c 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec }: +{ cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.2.1.4"; sha256 = "16a842bee5db116f754b459ef261426b6705a6d79383c6d545c9df5f6329cd25"; - buildDepends = [ Cabal parsec ]; + buildDepends = [ parsec ]; meta = { description = "Networking-related facilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix index 248281ff0d3..ba33bc36643 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec }: +{ cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.2.1.7"; sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58"; - buildDepends = [ Cabal parsec ]; + buildDepends = [ parsec ]; meta = { description = "Networking-related facilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.11.nix b/pkgs/development/libraries/haskell/network/2.3.0.11.nix index 602fa228dff..7007211a721 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.11.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.11.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec }: +{ cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.11"; sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk"; - buildDepends = [ Cabal parsec ]; + buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix index c4631e4a0ab..9d2642a487d 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec }: +{ cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.2"; sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03"; - buildDepends = [ Cabal parsec ]; + buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix index ae689ce996b..bf9330eb256 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec }: +{ cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.5"; sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; - buildDepends = [ Cabal parsec ]; + buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix index 5004d55017b..934bb76dcd4 100644 --- a/pkgs/development/libraries/haskell/non-negative/default.nix +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, QuickCheck, utilityHt }: +{ cabal, QuickCheck, utilityHt }: cabal.mkDerivation (self: { pname = "non-negative"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0aebb6f5518191a02b11230798444997a03b84d63d2aaa6c38cac6718f6c351c"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal QuickCheck utilityHt ]; + buildDepends = [ QuickCheck utilityHt ]; meta = { homepage = "http://code.haskell.org/~thielema/non-negative/"; description = "Non-negative numbers"; diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 631c183215e..94ec52e0ac7 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, deepseq, nonNegative, parsec, QuickCheck, random +{ cabal, deepseq, nonNegative, parsec, QuickCheck, random , storableRecord, utilityHt }: @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal deepseq nonNegative parsec QuickCheck random storableRecord + deepseq nonNegative parsec QuickCheck random storableRecord utilityHt ]; meta = { diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix index a236434f0be..b55e0c50b4b 100644 --- a/pkgs/development/libraries/haskell/numtype/default.nix +++ b/pkgs/development/libraries/haskell/numtype/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "numtype"; version = "1.0"; sha256 = "2606e81d7bcef0ba76b1e6ffc8d513c36fef5fefaab3bdd02da18761ec504e1f"; - buildDepends = [ Cabal ]; meta = { homepage = "http://dimensional.googlecode.com/"; description = "Type-level (low cardinality) integers"; diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index def80594aac..063fe6f45c5 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, syb }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "pandoc-types"; version = "1.9.0.2"; sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index ca03f9be534..4da060b3517 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,4 +1,4 @@ -{ cabal, base64Bytestring, blazeHtml, Cabal, citeprocHs +{ cabal, base64Bytestring, blazeHtml, citeprocHs , extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl , network, pandocTypes, parsec, random, syb, tagsoup, temporary , texmath, time, utf8String, xml, zipArchive, zlib @@ -11,10 +11,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml Cabal citeprocHs extensibleExceptions - filepath highlightingKate HTTP json mtl network pandocTypes parsec - random syb tagsoup temporary texmath time utf8String xml zipArchive - zlib + base64Bytestring blazeHtml citeprocHs extensibleExceptions filepath + highlightingKate HTTP json mtl network pandocTypes parsec random + syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index ded28f56571..99e4d04f774 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -1,12 +1,11 @@ -{ cabal, Cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango -, pkgconfig +{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig }: cabal.mkDerivation (self: { pname = "pango"; version = "0.12.2"; sha256 = "0kf9sw2ajqlvv9n685fbif7c8x1qnz4w3y3xqql3a1rv6s3kmqba"; - buildDepends = [ Cabal cairo glib mtl ]; + buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ cairo pango ]; diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix index 435785d7fac..2977a60964c 100644 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "parallel"; version = "1.1.0.1"; sha256 = "0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f"; - buildDepends = [ Cabal ]; meta = { description = "parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix index 651fc460e3f..185e86b02e8 100644 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "parallel"; version = "2.2.0.1"; sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix index 166e6b0c1db..37d537185cb 100644 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "parallel"; version = "3.1.0.1"; sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 502e24f0928..81d37e3a2b0 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "parallel"; version = "3.2.0.2"; sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index 8e718e32d24..4f50be5f700 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "parseargs"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "1ncdbjzfkhb1f3aznsci26kss9nrv3iilc65q5xdl9nly8p837mv"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://wiki.cs.pdx.edu/bartforge/parseargs"; description = "Command-line argument parsing library for Haskell programs"; diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix index f6a445821d3..155e4f09007 100644 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "parsec"; version = "2.1.0.1"; sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix index 1f9f952365a..e740ca91dba 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "parsec"; version = "3.1.1"; sha256 = "0x34gwn9k68h69c3hw7yaah6zpdwq8hvqss27f3n4n4cp7dh81fk"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix index 96cffcae137..95ef6219dbb 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, text }: +{ cabal, mtl, text }: cabal.mkDerivation (self: { pname = "parsec"; version = "3.1.2"; sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch"; - buildDepends = [ Cabal mtl text ]; + buildDepends = [ mtl text ]; meta = { homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix index ac7ef78fdd1..55bc7f74d29 100644 --- a/pkgs/development/libraries/haskell/parsimony/default.nix +++ b/pkgs/development/libraries/haskell/parsimony/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "parsimony"; version = "1.3"; sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { description = "Monadic parser combinators derived from Parsec"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix index f1e39891aee..6230ac2e8a3 100755 --- a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix +++ b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "path-pieces"; version = "0.0.0"; sha256 = "09sk4wlzy37gaii7spisjy4a3pizis9si4kv389bki20gfwpaivf"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "http://github.com/snoyberg/path-pieces"; description = "Components of paths"; diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix index 118c025a94e..9c3c8dbc79a 100755 --- a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix +++ b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "path-pieces"; version = "0.1.0"; sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "http://github.com/snoyberg/path-pieces"; description = "Components of paths"; diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix index 6a3894739f7..8c776e68b1a 100644 --- a/pkgs/development/libraries/haskell/pathtype/default.nix +++ b/pkgs/development/libraries/haskell/pathtype/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, QuickCheck }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "pathtype"; version = "0.5.2"; sha256 = "0rbmq6kzz2l07q9a5k888scpn62hnw2hmzz4ysprhfgdnn5b2cvi"; - buildDepends = [ Cabal QuickCheck ]; + buildDepends = [ QuickCheck ]; meta = { homepage = "http://code.haskell.org/pathtype"; description = "Type-safe replacement for System.FilePath etc"; diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix index b15f200fa7d..3336b8f1c8a 100644 --- a/pkgs/development/libraries/haskell/pcre-light/default.nix +++ b/pkgs/development/libraries/haskell/pcre-light/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, pcre }: +{ cabal, pcre }: cabal.mkDerivation (self: { pname = "pcre-light"; version = "0.4"; sha256 = "1xiikiap1bvx9czw64664vifdq64scx0yhfclh5m8mkvn3x6yzxk"; - buildDepends = [ Cabal ]; extraLibraries = [ pcre ]; meta = { homepage = "http://code.haskell.org/~dons/code/pcre-light"; diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index c9647768af4..e9cfbaeff50 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, Cabal, conduit, monadControl, persistent, text +{ cabal, aeson, conduit, monadControl, persistent, text , transformers }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.8.0"; sha256 = "19dly53g4jzcqi9px49w9qaf2vnlpsxc6jf5xn63827ylmxlmk5q"; buildDepends = [ - aeson Cabal conduit monadControl persistent text transformers + aeson conduit monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 444b2b12b60..7ea678266f4 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,13 +1,10 @@ -{ cabal, aeson, Cabal, monadControl, persistent, text, transformers -}: +{ cabal, aeson, monadControl, persistent, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-template"; version = "0.8.1.1"; sha256 = "1wl669h8az9wviaq04pwg7w3g5cc90hafn2f1p3jybbif0hpqhks"; - buildDepends = [ - aeson Cabal monadControl persistent text transformers - ]; + buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 394ea83e1fe..51fdacfcf2b 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,7 +1,7 @@ -{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, Cabal -, conduit, liftedBase, monadControl, mtl, pathPieces, poolConduit -, sqlite, text, time, transformers, transformersBase -, unorderedContainers, vector +{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit +, liftedBase, monadControl, mtl, pathPieces, poolConduit, sqlite +, text, time, transformers, transformersBase, unorderedContainers +, vector }: cabal.mkDerivation (self: { @@ -9,9 +9,9 @@ cabal.mkDerivation (self: { version = "0.8.0"; sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr"; buildDepends = [ - aeson attoparsec base64Bytestring blazeHtml Cabal conduit - liftedBase monadControl mtl pathPieces poolConduit text time - transformers transformersBase unorderedContainers vector + aeson attoparsec base64Bytestring blazeHtml conduit liftedBase + monadControl mtl pathPieces poolConduit text time transformers + transformersBase unorderedContainers vector ]; extraLibraries = [ sqlite ]; meta = { diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index 8f52486017c..b27dc9cc695 100644 --- a/pkgs/development/libraries/haskell/polyparse/default.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "polyparse"; version = "1.7"; sha256 = "de8ed0ce54f1f81bb0783dd97b7b22eca28df4a238684a26b37c5af2d17a364b"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "http://code.haskell.org/~malcolm/polyparse/"; description = "A variety of alternative parser combinator libraries"; diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index ef53cbdf70c..339ec70593c 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, conduit, resourcePool, transformers }: +{ cabal, conduit, resourcePool, transformers }: cabal.mkDerivation (self: { pname = "pool-conduit"; version = "0.0.0.1"; sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0"; - buildDepends = [ Cabal conduit resourcePool transformers ]; + buildDepends = [ conduit resourcePool transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT"; diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix index 8e223cc6cef..fb417a3faf2 100644 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ b/pkgs/development/libraries/haskell/pool/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, monadControl, transformers }: +{ cabal, monadControl, transformers }: cabal.mkDerivation (self: { pname = "pool"; version = "0.1.2.1"; sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; - buildDepends = [ Cabal monadControl transformers ]; + buildDepends = [ monadControl transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Thread-safe resource pools. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix index d39aa47969e..df204fa2482 100644 --- a/pkgs/development/libraries/haskell/ppm/default.nix +++ b/pkgs/development/libraries/haskell/ppm/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "ppm"; version = "2009.5.13"; sha256 = "9e390ca9a9e6e740fa71d2b72fa2c9c3d521118b0ebb35f10fabbbe543ecfb5b"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://github.com/nfjinjing/ppm/tree/master"; description = "a tiny PPM image generator"; diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index 55f323e2cca..19398be7ac7 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, haskellLexer }: +{ cabal, haskellLexer }: cabal.mkDerivation (self: { pname = "pretty-show"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal haskellLexer ]; + buildDepends = [ haskellLexer ]; meta = { homepage = "http://wiki.github.com/yav/pretty-show"; description = "Tools for working with derived Show instances"; diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix index 67044e0d793..ab8dc18ad0a 100644 --- a/pkgs/development/libraries/haskell/primitive/default.nix +++ b/pkgs/development/libraries/haskell/primitive/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "primitive"; version = "0.4.1"; sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/primitive"; description = "Wrappers for primitive operations"; diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix index dbaca7110fe..5459b8fa6dc 100644 --- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, fgl, graphviz, mtl, prolog, text }: +{ cabal, fgl, graphviz, mtl, prolog, text }: cabal.mkDerivation (self: { pname = "prolog-graph-lib"; version = "0.1"; sha256 = "1gryhk0jd8bvmjbjkz6n7sfnsa6iwzkckpgi51xsj5f2nwdxbl6g"; - buildDepends = [ Cabal fgl graphviz mtl prolog text ]; + buildDepends = [ fgl graphviz mtl prolog text ]; meta = { homepage = "https://github.com/Erdwolf/prolog"; description = "Generating images of resolution trees for Prolog queries"; diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix index b2de564d954..446a430ed7c 100644 --- a/pkgs/development/libraries/haskell/prolog-graph/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix @@ -1,5 +1,4 @@ -{ cabal, Cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib -, text +{ cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text }: cabal.mkDerivation (self: { @@ -9,7 +8,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - Cabal cmdargs fgl graphviz mtl prolog prologGraphLib text + cmdargs fgl graphviz mtl prolog prologGraphLib text ]; meta = { homepage = "https://github.com/Erdwolf/prolog"; diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix index 9e23f08d34c..6702e2e3887 100644 --- a/pkgs/development/libraries/haskell/prolog/default.nix +++ b/pkgs/development/libraries/haskell/prolog/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec, syb, thLift, transformers }: +{ cabal, mtl, parsec, syb, thLift, transformers }: cabal.mkDerivation (self: { pname = "prolog"; version = "0.1"; sha256 = "00791fb1f84wq42wvacnjl290fbn28x9hknxsic3ksi3f7psladm"; - buildDepends = [ Cabal mtl parsec syb thLift transformers ]; + buildDepends = [ mtl parsec syb thLift transformers ]; meta = { homepage = "https://github.com/Erdwolf/prolog"; description = "A Prolog interpreter written in Haskell"; diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix index 098f7e60cd1..2dfc0091799 100644 --- a/pkgs/development/libraries/haskell/pureMD5/default.nix +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, Cabal, cereal, cryptoApi, tagged }: +{ cabal, binary, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { pname = "pureMD5"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0whlsb6zq4zcp3wq0bd6pgcsl0namr8b2s6i4l5aykq8v7fx40ii"; isLibrary = true; isExecutable = true; - buildDepends = [ binary Cabal cereal cryptoApi tagged ]; + buildDepends = [ binary cereal cryptoApi tagged ]; meta = { description = "A Haskell-only implementation of the MD5 digest (hash) algorithm"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index e41890234f0..a78471d8ebb 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -1,10 +1,10 @@ -{ cabal, base64Bytestring, Cabal, cryptohash, random }: +{ cabal, base64Bytestring, cryptohash, random }: cabal.mkDerivation (self: { pname = "pwstore-fast"; version = "2.2"; sha256 = "03b9vr5j6cadvi6w3lr8b9km4jq6jh0vzcmkxzq9qvvly89lx96a"; - buildDepends = [ base64Bytestring Cabal cryptohash random ]; + buildDepends = [ base64Bytestring cryptohash random ]; meta = { homepage = "https://github.com/PeterScott/pwstore"; description = "Secure password storage"; diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index f7f64481e5c..653a4c8534d 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, erf, gamma, monadLoops, mtl, randomShuffle -, randomSource, rvar, syb, transformers, vector +{ cabal, erf, gamma, monadLoops, mtl, randomShuffle, randomSource +, rvar, syb, transformers, vector }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.1.1"; sha256 = "034pnmagly3akmmcli018258fnyqlyz79av21dqqklfixvw3yja7"; buildDepends = [ - Cabal erf gamma monadLoops mtl randomShuffle randomSource rvar syb + erf gamma monadLoops mtl randomShuffle randomSource rvar syb transformers vector ]; meta = { diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix index 91aa59b1093..174bc9ef842 100644 --- a/pkgs/development/libraries/haskell/random-shuffle/default.nix +++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, MonadRandom, random }: +{ cabal, MonadRandom, random }: cabal.mkDerivation (self: { pname = "random-shuffle"; version = "0.0.3"; sha256 = "120yh2k1n57vc9mi4dlnvv9dr79qaz4dsbvl3qp3y82mdz8maifw"; - buildDepends = [ Cabal MonadRandom random ]; + buildDepends = [ MonadRandom random ]; meta = { description = "Random shuffle implementation"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix index 124783fe2fd..caa4b65814c 100755 --- a/pkgs/development/libraries/haskell/random-source/default.nix +++ b/pkgs/development/libraries/haskell/random-source/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, flexibleDefaults, mersenneRandomPure64, mtl -, mwcRandom, random, stateref, syb, thExtras +{ cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom +, random, stateref, syb, thExtras }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.3.0.2"; sha256 = "0sp39bj7rqg4w4rc4d4zgj0f77c23z4xc47p55chy12znc4frlp2"; buildDepends = [ - Cabal flexibleDefaults mersenneRandomPure64 mtl mwcRandom random - stateref syb thExtras + flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref + syb thExtras ]; meta = { homepage = "https://github.com/mokus0/random-fu"; diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix index dfbec81575e..a4feee31d02 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, time }: +{ cabal, time }: cabal.mkDerivation (self: { pname = "random"; version = "1.0.1.1"; sha256 = "0n8m2744gg233s357vqzq3mfhhnbhynqvp4gxsi2gb70bm03nz6z"; - buildDepends = [ Cabal time ]; + buildDepends = [ time ]; meta = { description = "random number library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix index 5b06d78d24b..0ba35027050 100644 --- a/pkgs/development/libraries/haskell/ranges/default.nix +++ b/pkgs/development/libraries/haskell/ranges/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "ranges"; version = "0.2.4"; sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv"; - buildDepends = [ Cabal ]; meta = { description = "Ranges and various functions on them"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index c0778c69563..60747bbda68 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HTTP, network, xhtml }: +{ cabal, HTTP, network, xhtml }: cabal.mkDerivation (self: { pname = "recaptcha"; version = "0.1"; sha256 = "de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144"; - buildDepends = [ Cabal HTTP network xhtml ]; + buildDepends = [ HTTP network xhtml ]; meta = { homepage = "http://github.com/jgm/recaptcha/tree/master"; description = "Functions for using the reCAPTCHA service in web applications"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix index 2ba070ba9a6..09e4906da01 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "regex-base"; version = "0.72.0.2"; sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee"; - buildDepends = [ Cabal ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix index ae062764354..8fbc2f9e84d 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "regex-base"; version = "0.93.1"; sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix index 4280f8a87de..50f039a3d27 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "regex-base"; version = "0.93.2"; sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix index 7790f03eebc..ed88e247e5b 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase, regexPosix }: +{ cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.71.0.1"; sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d"; - buildDepends = [ Cabal regexBase regexPosix ]; + buildDepends = [ regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix index 08f8e30d8dc..3db0f5d4065 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase, regexPosix }: +{ cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.92"; sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; - buildDepends = [ Cabal regexBase regexPosix ]; + buildDepends = [ regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix index eb5c3752081..3a28e505a82 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase, regexPosix }: +{ cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.93.1"; sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf"; - buildDepends = [ Cabal regexBase regexPosix ]; + buildDepends = [ regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix index f3489e30105..138702e1d41 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase, regexPosix }: +{ cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.95.1"; sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m"; - buildDepends = [ Cabal regexBase regexPosix ]; + buildDepends = [ regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix index 2eb85bbdb01..f3c6e02caf5 100644 --- a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase }: +{ cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-pcre-builtin"; version = "0.94.2.1.7.7"; sha256 = "1c4zxfild1fbpxwqcp2jnf6iwfs0z6nc8dry09gmjykxlhisxi8s"; - buildDepends = [ Cabal regexBase ]; + buildDepends = [ regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index 15081e7f91a..68c39818517 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, pcre, regexBase }: +{ cabal, pcre, regexBase }: cabal.mkDerivation (self: { pname = "regex-pcre"; version = "0.94.2"; sha256 = "0p4az8z4jlrcmmyz9bjf7n90hpg6n242vq4255w2dz5v29l822wn"; - buildDepends = [ Cabal regexBase ]; + buildDepends = [ regexBase ]; extraLibraries = [ pcre ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix index 773217fa4e3..961aab9e2f7 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase }: +{ cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.72.0.3"; sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1"; - buildDepends = [ Cabal regexBase ]; + buildDepends = [ regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix index 3706c6826dd..223c9baedcd 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase }: +{ cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.94.1"; sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c"; - buildDepends = [ Cabal regexBase ]; + buildDepends = [ regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix index e7d9e016a96..9a570d4ca20 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase }: +{ cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.94.2"; sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067"; - buildDepends = [ Cabal regexBase ]; + buildDepends = [ regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix index af3dc9bc577..e78c7fe2584 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase }: +{ cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.94.4"; sha256 = "1ykirysvz9ganm2k7fmrppklsgh0h35mjfsi9g1icv43pqpr6ldw"; - buildDepends = [ Cabal regexBase ]; + buildDepends = [ regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix index bf83581748d..ca6358baeed 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, regexBase }: +{ cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.95.1"; sha256 = "02pgxwbgz738kpdmsg18xs6kmq6my5hqd9cl4rm7cg2v39di9vbl"; - buildDepends = [ Cabal regexBase ]; + buildDepends = [ regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix index 3fc14b45ccc..82fa24016bc 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, parsec, regexBase }: +{ cabal, mtl, parsec, regexBase }: cabal.mkDerivation (self: { pname = "regex-tdfa"; version = "1.1.8"; sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x"; - buildDepends = [ Cabal mtl parsec regexBase ]; + buildDepends = [ mtl parsec regexBase ]; meta = { homepage = "http://hackage.haskell.org/package/regex-tdfa"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix index ea7ec6bc223..538b980b438 100644 --- a/pkgs/development/libraries/haskell/regexpr/default.nix +++ b/pkgs/development/libraries/haskell/regexpr/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HUnit, mtl, mtlparse }: +{ cabal, HUnit, mtl, mtlparse }: cabal.mkDerivation (self: { pname = "regexpr"; version = "0.5.4"; sha256 = "bf7813247f26877d9fba4ba4b66eb80bfddfc2086a5cd8d635b2da0ccde56604"; - buildDepends = [ Cabal HUnit mtl mtlparse ]; + buildDepends = [ HUnit mtl mtlparse ]; meta = { homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/"; description = "regular expression like Perl/Ruby in Haskell"; diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 63a8be9ce05..0085d866567 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "regular"; version = "0.3.4"; sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq"; - buildDepends = [ Cabal ]; meta = { description = "Generic programming library for regular datatypes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index ebe526c9559..991c1a3d779 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, repa, vector }: +{ cabal, repa, vector }: cabal.mkDerivation (self: { pname = "repa-algorithms"; version = "2.2.0.1"; sha256 = "1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p"; - buildDepends = [ Cabal repa vector ]; + buildDepends = [ repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix index ac1b1ca18a1..b06072d798b 100644 --- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/repa-bytestring/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, repa, vector }: +{ cabal, repa, vector }: cabal.mkDerivation (self: { pname = "repa-bytestring"; version = "2.2.0.1"; sha256 = "0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg"; - buildDepends = [ Cabal repa vector ]; + buildDepends = [ repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Conversions between Repa Arrays and ByteStrings"; diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 80b45228bc7..75d18daa635 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -1,5 +1,4 @@ -{ cabal, Cabal, llvm, random, repa, repaAlgorithms, repaIo, vector -}: +{ cabal, llvm, random, repa, repaAlgorithms, repaIo, vector }: cabal.mkDerivation (self: { pname = "repa-examples"; @@ -7,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal random repa repaAlgorithms repaIo vector ]; + buildDepends = [ random repa repaAlgorithms repaIo vector ]; extraLibraries = [ llvm ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index d80cad2627a..e4eb113a435 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, bmp, Cabal, repa, repaBytestring, vector }: +{ cabal, binary, bmp, repa, repaBytestring, vector }: cabal.mkDerivation (self: { pname = "repa-io"; version = "2.2.0.1"; sha256 = "1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1"; - buildDepends = [ binary bmp Cabal repa repaBytestring vector ]; + buildDepends = [ binary bmp repa repaBytestring vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index 2dc70a04d1a..ffa75a9fd4f 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, QuickCheck, vector }: +{ cabal, QuickCheck, vector }: cabal.mkDerivation (self: { pname = "repa"; version = "2.2.0.1"; sha256 = "016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy"; - buildDepends = [ Cabal QuickCheck vector ]; + buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "High performance, regular, shape polymorphic parallel arrays"; diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix index 09a69eba005..bad1e93d6b9 100644 --- a/pkgs/development/libraries/haskell/repr/default.nix +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -1,13 +1,11 @@ -{ cabal, baseUnicodeSymbols, Cabal, dstring, random -, stringCombinators -}: +{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }: cabal.mkDerivation (self: { pname = "repr"; version = "0.4.1.2"; sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs"; buildDepends = [ - baseUnicodeSymbols Cabal dstring random stringCombinators + baseUnicodeSymbols dstring random stringCombinators ]; meta = { homepage = "https://github.com/basvandijk/repr"; diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index 4c0befe9ac6..51952598f61 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, hashable, monadControl, stm, time, transformers +{ cabal, hashable, monadControl, stm, time, transformers , transformersBase, vector }: @@ -7,8 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.1.0"; sha256 = "12akfi906l1nm7h3wvjkzl9bxn74dbv17xw2c1mqgl6sg470d587"; buildDepends = [ - Cabal hashable monadControl stm time transformers transformersBase - vector + hashable monadControl stm time transformers transformersBase vector ]; meta = { homepage = "http://github.com/bos/pool"; diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix index f643f2cca72..640faeb7d59 100755 --- a/pkgs/development/libraries/haskell/rvar/default.nix +++ b/pkgs/development/libraries/haskell/rvar/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, MonadPrompt, mtl, randomSource, transformers }: +{ cabal, MonadPrompt, mtl, randomSource, transformers }: cabal.mkDerivation (self: { pname = "rvar"; version = "0.2"; sha256 = "1in2qn1clv9b7ijyllhjflh9zdkna31hpyclhlkfnsc6899z3y1f"; - buildDepends = [ Cabal MonadPrompt mtl randomSource transformers ]; + buildDepends = [ MonadPrompt mtl randomSource transformers ]; meta = { homepage = "https://github.com/mokus0/random-fu"; description = "Random Variables"; diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index e2a7518dbd0..067b7c4cf67 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "safe"; version = "0.3.3"; sha256 = "0ig9laq1p4iic24smjb304mvlsvdyn90lvxh64c4p75c8g459489"; - buildDepends = [ Cabal ]; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library for safe (pattern match free) functions"; diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index c56e1c26f82..71b9a6c6c47 100755 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "semigroups"; version = "0.8"; sha256 = "12ly9f1lxzrxvwkcx25cjik7d1f1l2j1rkd0cabgpcg53hz4158c"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index aef9c2d3f35..b2c24da5b1b 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, network }: +{ cabal, network }: cabal.mkDerivation (self: { pname = "sendfile"; version = "0.7.4"; sha256 = "1h02fjdivsb3divdn3wg2skmw3jcd0n4axhlpgmrrbf92c3m35rq"; - buildDepends = [ Cabal network ]; + buildDepends = [ network ]; meta = { homepage = "http://patch-tag.com/r/mae/sendfile"; description = "A portable sendfile library"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 276137912a2..613399fa75b 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec, shakespeare, text }: +{ cabal, parsec, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-css"; version = "0.10.7"; sha256 = "0cla600s5715glimlf58gndpp7njhm26j78bfm16cxia5psp5zav"; - buildDepends = [ Cabal parsec shakespeare text ]; + buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "Stick your haskell variables into css at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index f00e59d9946..fc7025e64da 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec, shakespeare, text }: +{ cabal, parsec, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-i18n"; version = "0.0.2"; sha256 = "1hb144n3fa5qiy3skrmab0qv63fa5vf4vg4ar9hrybmwdksqa410"; - buildDepends = [ Cabal parsec shakespeare text ]; + buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/i18n"; description = "A type-based approach to internationalization"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 2272766330f..b1dfc72ecec 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, shakespeare, text }: +{ cabal, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-js"; version = "0.11.0.1"; sha256 = "01gmsk1q5iq23m93n8mcmm02jqv3i7ksf1jw4qnla1gssdkx8ggk"; - buildDepends = [ Cabal shakespeare text ]; + buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 4e2f87bfd6e..01fff9ff998 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, shakespeare, text }: +{ cabal, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-text"; version = "0.10.5"; sha256 = "13nhasfbza73kv3iin16iidwyz71b8d75vq0ym37zygpxb5izkvw"; - buildDepends = [ Cabal shakespeare text ]; + buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "Interpolation with quasi-quotation: put variables strings"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 79d37a95422..44fcbb277b7 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, parsec, text }: +{ cabal, parsec, text }: cabal.mkDerivation (self: { pname = "shakespeare"; version = "0.10.3.1"; sha256 = "1wfw5qbgl4jl1r4gaw55mnsmn70vpzn7ykz3gbqzrf91wc6s3zj4"; - buildDepends = [ Cabal parsec text ]; + buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "A toolkit for making compile-time interpolated templates"; diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 3aee20bd69a..256ac903dd7 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, network }: +{ cabal, network }: cabal.mkDerivation (self: { pname = "simple-sendfile"; version = "0.2.1"; sha256 = "0mbnqdy7g9jp2d6x9mcrz315b4xhp92as28bxygf7jhc0aai66aq"; - buildDepends = [ Cabal network ]; + buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index e938eef2e49..844e13c11dc 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, cereal, cryptoApi, tagged }: +{ cabal, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { pname = "skein"; version = "0.1.0.5"; sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb"; - buildDepends = [ Cabal cereal cryptoApi tagged ]; + buildDepends = [ cereal cryptoApi tagged ]; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index 520a4209da6..d8a9bf24f55 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, dlist }: +{ cabal, dlist }: cabal.mkDerivation (self: { pname = "smallcheck"; version = "0.6"; sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v"; - buildDepends = [ Cabal dlist ]; + buildDepends = [ dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 56190cb06f1..b9014288f80 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,8 +1,8 @@ { cabal, attoparsec, attoparsecEnumerator, base16Bytestring , blazeBuilder, blazeBuilderEnumerator, bytestringMmap -, bytestringNums, Cabal, caseInsensitive, deepseq, dlist -, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl -, mwcRandom, regexPosix, text, time, transformers, unixCompat +, bytestringNums, caseInsensitive, deepseq, dlist, enumerator +, filepath, HUnit, MonadCatchIOTransformers, mtl, mwcRandom +, regexPosix, text, time, transformers, unixCompat , unorderedContainers, vector, zlibEnum }: @@ -12,7 +12,7 @@ cabal.mkDerivation (self: { sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder - blazeBuilderEnumerator bytestringMmap bytestringNums Cabal + blazeBuilderEnumerator bytestringMmap bytestringNums caseInsensitive deepseq dlist enumerator filepath HUnit MonadCatchIOTransformers mtl mwcRandom regexPosix text time transformers unixCompat unorderedContainers vector zlibEnum diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index ffb668a995b..73ddf11b81d 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,5 +1,5 @@ { cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder -, blazeBuilderEnumerator, bytestringNums, Cabal, caseInsensitive +, blazeBuilderEnumerator, bytestringNums, caseInsensitive , directoryTree, enumerator, filepath, MonadCatchIOTransformers , mtl, murmurHash, network, PSQueue, snapCore, text, time , transformers, unixCompat, vector, vectorAlgorithms @@ -11,10 +11,10 @@ cabal.mkDerivation (self: { sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder - blazeBuilderEnumerator bytestringNums Cabal caseInsensitive - directoryTree enumerator filepath MonadCatchIOTransformers mtl - murmurHash network PSQueue snapCore text time transformers - unixCompat vector vectorAlgorithms + blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree + enumerator filepath MonadCatchIOTransformers mtl murmurHash network + PSQueue snapCore text time transformers unixCompat vector + vectorAlgorithms ]; meta = { homepage = "http://snapframework.com/"; diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 9dd364f6a3c..ab52a72f6ce 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, cereal, network }: +{ cabal, cereal, network }: cabal.mkDerivation (self: { pname = "socks"; version = "0.4.1"; sha256 = "0kapic4rf1cwbqy5f229b69kr1mg9blpr5p5jna8sx5ds2b8jdjn"; - buildDepends = [ Cabal cereal network ]; + buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; description = "Socks proxy (version 5) implementation"; diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 2afe2065038..604c4a0a0f2 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "split"; version = "0.1.4.2"; sha256 = "09vi7vw4i4r78gyp3bbvhvvyiqi8rgf678ppmq99qrfqm34c2fl9"; - buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix index 9efb9c811cc..b14fd6ebade 100644 --- a/pkgs/development/libraries/haskell/stateref/default.nix +++ b/pkgs/development/libraries/haskell/stateref/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, stm }: +{ cabal, mtl, stm }: cabal.mkDerivation (self: { pname = "stateref"; version = "0.3"; sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx"; - buildDepends = [ Cabal mtl stm ]; + buildDepends = [ mtl stm ]; meta = { homepage = "http://code.haskell.org/~mokus/stateref/"; description = "Abstraction for things that work like IORef"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 4a893827aab..97202c4ec60 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, deepseq, erf, mathFunctions, monadPar, mwcRandom +{ cabal, deepseq, erf, mathFunctions, monadPar, mwcRandom , primitive, vector, vectorAlgorithms }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.1.0"; sha256 = "0fnpwnhcwxjcm81b9daqdy07cw5qgqa7m2bj6fxxwicpvawcyabc"; buildDepends = [ - Cabal deepseq erf mathFunctions monadPar mwcRandom primitive vector + deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms ]; meta = { diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix index 34c25af1f3d..1521763f2bf 100644 --- a/pkgs/development/libraries/haskell/stb-image/default.nix +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -1,10 +1,10 @@ -{ cabal, bitmap, Cabal }: +{ cabal, bitmap }: cabal.mkDerivation (self: { pname = "stb-image"; version = "0.2.1"; sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52"; - buildDepends = [ bitmap Cabal ]; + buildDepends = [ bitmap ]; meta = { homepage = "http://code.haskell.org/~bkomuves/"; description = "A wrapper around Sean Barrett's JPEG/PNG decoder"; diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix index 2a76580ef1d..6184a324181 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "stm"; version = "2.1.1.2"; sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d"; - buildDepends = [ Cabal ]; meta = { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix index ca7a07e14f7..8615f10be80 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "stm"; version = "2.1.2.1"; sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8"; - buildDepends = [ Cabal ]; meta = { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix index 304191c7281..1174a9740e5 100644 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "stm"; version = "2.2.0.1"; sha256 = "1p0x414ffsd77mmlfz1cmwg2cbhinnbpxypxgvygg05js67msj8q"; - buildDepends = [ Cabal ]; meta = { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix index 7a559067b11..dc36d53f046 100644 --- a/pkgs/development/libraries/haskell/storable-complex/default.nix +++ b/pkgs/development/libraries/haskell/storable-complex/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "storable-complex"; version = "0.2.1"; sha256 = "0dnxnsi7m5whwwki3fry6db6gyy5qzfz8jcj1fg3fhfyf4f9wpaz"; - buildDepends = [ Cabal ]; meta = { description = "Storable instance for Complex"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index 46edc44f548..180f47939cc 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, transformers, utilityHt }: +{ cabal, transformers, utilityHt }: cabal.mkDerivation (self: { pname = "storable-record"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "5ed2680dcfc4c3d4fe605d23e797b847fe047b7acd3f4acfd82155c93e72b280"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal transformers utilityHt ]; + buildDepends = [ transformers utilityHt ]; meta = { homepage = "http://code.haskell.org/~thielema/storable-record/"; description = "Elegant definition of Storable instances for records"; diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index 33fcf1a38f3..fef81d92212 100755 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "streamproc"; version = "1.6"; sha256 = "0bb1rdzzpjggw7dk4q3hwa1j1bvkfqhz6vrd45shcp57ixqlp6ws"; - buildDepends = [ Cabal ]; meta = { homepage = "http://gitorious.org/streamproc"; description = "Stream Processer Arrow"; diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix index 4a883dbecbd..99239884b0a 100644 --- a/pkgs/development/libraries/haskell/strict/default.nix +++ b/pkgs/development/libraries/haskell/strict/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "strict"; version = "0.3.2"; sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html"; description = "Strict data types and String IO"; diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index dab3b1393f8..083f3e06d5b 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "strict-concurrency"; version = "0.2.4.1"; sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { homepage = "http://code.haskell.org/~dons/code/strict-concurrency"; description = "Strict concurrency abstractions"; diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index 100df103d31..6d04dcf10db 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols, Cabal }: +{ cabal, baseUnicodeSymbols }: cabal.mkDerivation (self: { pname = "string-combinators"; version = "0.6.0.3"; sha256 = "18jawxqvcj7zpvb0wf1zln12s03mp6nglhv5ccywrkb5x0r0557j"; - buildDepends = [ baseUnicodeSymbols Cabal ]; + buildDepends = [ baseUnicodeSymbols ]; meta = { homepage = "https://github.com/basvandijk/string-combinators"; description = "Polymorphic functions to build and combine stringlike values"; diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 808a0822140..9d1ae862ee1 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -1,11 +1,10 @@ -{ cabal, Cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl -}: +{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }: cabal.mkDerivation (self: { pname = "svgcairo"; version = "0.12.1"; sha256 = "1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps"; - buildDepends = [ Cabal cairo glib mtl ]; + buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; pkgconfigDepends = [ librsvg ]; diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix index f65fddfe16c..070279fadfd 100644 --- a/pkgs/development/libraries/haskell/syb/0.2.2.nix +++ b/pkgs/development/libraries/haskell/syb/0.2.2.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.2.2"; sha256 = "0m29vnqkkmpf4m3gi42kcbr2gfyxgkcw85xsyrq0mgbxb0zg6ky9"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix index a54213d94ce..01cc80c883d 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.3.3"; sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.nix b/pkgs/development/libraries/haskell/syb/0.3.6.nix index 2cd457209ec..a40b25cc1bc 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.3.6"; sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix index 90625da1c98..ddf16ad41e5 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.3"; sha256 = "1gnqw76zy7xvlabhbyk8hml88hpz2igf7b3mz2ic091f77qkkch7"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/default.nix b/pkgs/development/libraries/haskell/syb/default.nix index 5bee78f4c86..a98cf1e2da6 100644 --- a/pkgs/development/libraries/haskell/syb/default.nix +++ b/pkgs/development/libraries/haskell/syb/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.1.0.1"; sha256 = "08nf4id26s5iasxzdy5jds6h87fy3a55zgw0zrig4dg6difmwjp3"; - buildDepends = [ Cabal ]; meta = { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix index 475375790c5..2f3167ff628 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, sybWithClass, text }: +{ cabal, sybWithClass, text }: cabal.mkDerivation (self: { pname = "syb-with-class-instances-text"; version = "0.0.1"; sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e"; - buildDepends = [ Cabal sybWithClass text ]; + buildDepends = [ sybWithClass text ]; meta = { description = "Scrap Your Boilerplate With Class Text instance"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index dc20d7421ba..79b90feaa85 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "syb-with-class"; version = "0.6.1.3"; sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d"; - buildDepends = [ Cabal ]; meta = { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 614c678f85b..56031ed3157 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, systemFilepath, text, time }: +{ cabal, systemFilepath, text, time }: cabal.mkDerivation (self: { pname = "system-fileio"; version = "0.3.5"; sha256 = "0d1baliykfpg15bzknx98slr0qa5yjr3va3w8hs02wgx6sp3wsy2"; - buildDepends = [ Cabal systemFilepath text time ]; + buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "Consistent filesystem interaction across GHC versions"; diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index fc1b4e2e56c..6dc4d44ee96 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq, text }: +{ cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "system-filepath"; version = "0.4.6"; sha256 = "0p8lf10b5zn2gw5klpjc397q892cydvnl677srj9rk3lhmsm5jjl"; - buildDepends = [ Cabal deepseq text ]; + buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index 336de68713f..a649ca04fec 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, csv, html, mtl }: +{ cabal, csv, html, mtl }: cabal.mkDerivation (self: { pname = "tabular"; version = "0.2.2.3"; sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76"; - buildDepends = [ Cabal csv html mtl ]; + buildDepends = [ csv html mtl ]; meta = { homepage = "http://patch-tag.com/r/kowey/tabular"; description = "Two-dimensional data tables with rendering functions"; diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index a68f7e92493..1f30245a320 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, dataDefault, semigroups }: +{ cabal, dataDefault, semigroups }: cabal.mkDerivation (self: { pname = "tagged"; version = "0.2.3.1"; sha256 = "0ldc9w35yzlrz78kakkqial32g2c7da9b5v334jh5wpgsn7lrm3n"; - buildDepends = [ Cabal dataDefault semigroups ]; + buildDepends = [ dataDefault semigroups ]; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index d85e943a7ee..a6fcea3c1c2 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "tagsoup"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1q1dzsaj131fcvibka72i7si1i0gxkz5d9zl0akd8mbapy5mmlv5"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "http://community.haskell.org/~ndm/tagsoup/"; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index 01c3b6505ff..72c90ab3dd2 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "temporary"; version = "1.1.2.3"; sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ filepath ]; meta = { homepage = "http://www.github.com/batterseapower/temporary"; description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 0bd351b9f6a..66212bbe385 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, ncurses }: +{ cabal, extensibleExceptions, ncurses }: cabal.mkDerivation (self: { pname = "terminfo"; version = "0.3.2.3"; sha256 = "06y2vx7d4hl55p3p1c7yj2lx8yaw14c5h2qclj8m5xg2wkifnf5f"; - buildDepends = [ Cabal extensibleExceptions ]; + buildDepends = [ extensibleExceptions ]; extraLibraries = [ ncurses ]; meta = { homepage = "http://code.haskell.org/terminfo"; diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index e64d3328dfe..e280d497bee 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, extensibleExceptions, HUnit, testFramework }: +{ cabal, extensibleExceptions, HUnit, testFramework }: cabal.mkDerivation (self: { pname = "test-framework-hunit"; version = "0.2.7"; sha256 = "1c7424i5vnggzncwiwqqwq7ir7kaijif2waqmss5pn6db3gj33fc"; - buildDepends = [ Cabal extensibleExceptions HUnit testFramework ]; + buildDepends = [ extensibleExceptions HUnit testFramework ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; description = "HUnit support for the test-framework package"; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index 7e638c535e6..db70ec18a98 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, deepseq, extensibleExceptions, QuickCheck, random +{ cabal, deepseq, extensibleExceptions, QuickCheck, random , testFramework }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.8"; sha256 = "0ca6s7dnrdr9s2gdpfb74lswlj2lj091crk89m3yqjcadchkh3vl"; buildDepends = [ - Cabal deepseq extensibleExceptions QuickCheck random testFramework + deepseq extensibleExceptions QuickCheck random testFramework ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index bb1aaf2c49a..8e3698ab000 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -1,13 +1,11 @@ -{ cabal, Cabal, extensibleExceptions, QuickCheck, random -, testFramework -}: +{ cabal, extensibleExceptions, QuickCheck, random, testFramework }: cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; version = "0.2.12"; sha256 = "08qr2lh1akjy5daxxk1sy59sg94hvv5s5njs9x6lrx648hy7y8iy"; buildDepends = [ - Cabal extensibleExceptions QuickCheck random testFramework + extensibleExceptions QuickCheck random testFramework ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix index 094377728b0..0c16a9e9e24 100644 --- a/pkgs/development/libraries/haskell/test-framework-th/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, haskellSrcExts, languageHaskellExtract, regexPosix +{ cabal, haskellSrcExts, languageHaskellExtract, regexPosix , testFramework }: @@ -7,8 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0nzfvxr5bnxinx41a5w5mwhyxzz2936dl0xhd80cv9plx19ylh0w"; buildDepends = [ - Cabal haskellSrcExts languageHaskellExtract regexPosix - testFramework + haskellSrcExts languageHaskellExtract regexPosix testFramework ]; meta = { homepage = "http://github.com/finnsson/test-generator"; diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 1e16354b385..6ac60c1df2d 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -1,5 +1,5 @@ -{ cabal, ansiTerminal, ansiWlPprint, Cabal, extensibleExceptions -, hostname, random, regexPosix, time, xml +{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname +, random, regexPosix, time, xml }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal ansiWlPprint Cabal extensibleExceptions hostname - random regexPosix time xml + ansiTerminal ansiWlPprint extensibleExceptions hostname random + regexPosix time xml ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix index 3b9d0297959..35b619166a4 100644 --- a/pkgs/development/libraries/haskell/testpack/default.nix +++ b/pkgs/development/libraries/haskell/testpack/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, HUnit, mtl, QuickCheck, random }: +{ cabal, HUnit, mtl, QuickCheck, random }: cabal.mkDerivation (self: { pname = "testpack"; version = "2.1.1"; sha256 = "1z8g3xhvy901h7kr7q4wcms5b23xniskrgxfpq42w4b34acwvhmg"; - buildDepends = [ Cabal HUnit mtl QuickCheck random ]; + buildDepends = [ HUnit mtl QuickCheck random ]; meta = { homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack"; description = "Test Utililty Pack for HUnit and QuickCheck"; diff --git a/pkgs/development/libraries/haskell/texmath/0.4.nix b/pkgs/development/libraries/haskell/texmath/0.4.nix index 58a8bc3ef4b..a59120015dd 100644 --- a/pkgs/development/libraries/haskell/texmath/0.4.nix +++ b/pkgs/development/libraries/haskell/texmath/0.4.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, parsec, syb, xml }: +{ cabal, parsec, syb, xml }: cabal.mkDerivation (self: { pname = "texmath"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1rvnhqljxkljy8ncpaj8p7b14nvvm6zmiixv13m1zxlcr457j2ai"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal parsec syb xml ]; + buildDepends = [ parsec syb xml ]; meta = { homepage = "http://github.com/jgm/texmath"; description = "Conversion of LaTeX math formulas to MathML"; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 25286cf2d75..7bd8217b434 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, parsec, syb, xml }: +{ cabal, parsec, syb, xml }: cabal.mkDerivation (self: { pname = "texmath"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal parsec syb xml ]; + buildDepends = [ parsec syb xml ]; meta = { homepage = "http://github.com/jgm/texmath"; description = "Conversion of LaTeX math formulas to MathML or OMML"; diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index 849c1ae5847..b997c60868b 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.0.5"; sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index 00120cd132b..5c593235dee 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.0.6"; sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.12.nix b/pkgs/development/libraries/haskell/text/0.11.1.12.nix index 76eaced44c9..805c96d2af0 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.12.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.12.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.12"; sha256 = "0j2044whj3xckmxqmgdjbc2mpwdan481qzjslwplqbqwml2jvkml"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix index 1910b347fa7..9576e1806e1 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.13"; sha256 = "0lbc4yfqpydps0rd1qjymnnhp87sl9w7n1f5vd5lsixby93zjv2f"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index 116b999cc30..db438a54bc2 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.5"; sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { homepage = "https://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index 98d56bc943d..9a5f4a32cda 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, syb }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "th-extras"; version = "0.0.0.1"; sha256 = "13d9fs48z87inma3kg9b7lfjp3h8j85fav6awd1zj3i2nl214hff"; - buildDepends = [ Cabal syb ]; + buildDepends = [ syb ]; meta = { homepage = "https://github.com/mokus0/th-extras"; description = "A grab bag of useful functions for use with Template Haskell"; diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index 571d06d55b0..aa7b5224de6 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "th-lift"; version = "0.5.5"; sha256 = "1zp9alv3nbvra1rscddak3i33c2jnv6g6806h94qbfkq3zbimfi0"; - buildDepends = [ Cabal ]; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix index 713b548a463..d4108f0a012 100644 --- a/pkgs/development/libraries/haskell/thespian/default.nix +++ b/pkgs/development/libraries/haskell/thespian/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "thespian"; version = "0.999"; sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn"; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; meta = { homepage = "http://bitbucket.org/alinabi/thespian"; description = "Lightweight Erlang-style actors for Haskell"; diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index 03904f642c1..d7f5a70bc34 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "threadmanager"; version = "0.1.4"; sha256 = "0p35ihdc9k9svzbwiszll5i53km09rvw5mqshph273fby7nvni9i"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/bsl/threadmanager"; description = "Simple thread management"; diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix index 17346ca3c15..7ced3956a8a 100644 --- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix +++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.1.2.4"; sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3"; - buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.1.3.nix b/pkgs/development/libraries/haskell/time/1.1.3.nix index bac6424d690..c8a7fe12985 100644 --- a/pkgs/development/libraries/haskell/time/1.1.3.nix +++ b/pkgs/development/libraries/haskell/time/1.1.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.1.3"; sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b"; - buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix index 34cc32f8c49..23cec7ab90f 100644 --- a/pkgs/development/libraries/haskell/time/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/time/1.2.0.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.2.0.3"; sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e"; - buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.2.0.5.nix b/pkgs/development/libraries/haskell/time/1.2.0.5.nix index 604459e8aaa..78fed9b5754 100644 --- a/pkgs/development/libraries/haskell/time/1.2.0.5.nix +++ b/pkgs/development/libraries/haskell/time/1.2.0.5.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.2.0.5"; sha256 = "0y4plv9qvpmzzzb5855zngm6lmd38m0vr2mzwm94xhz2xsqhdh2z"; - buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.4.0.1.nix b/pkgs/development/libraries/haskell/time/1.4.0.1.nix index 08ebc4fc1a6..8d9f810f724 100644 --- a/pkgs/development/libraries/haskell/time/1.4.0.1.nix +++ b/pkgs/development/libraries/haskell/time/1.4.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq }: +{ cabal, deepseq }: cabal.mkDerivation (self: { pname = "time"; version = "1.4.0.1"; sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws"; - buildDepends = [ Cabal deepseq ]; + buildDepends = [ deepseq ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 57a7394d9b6..278ca4bc1b8 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, certificate, cryptoApi, cryptocipher, cryptohash -, mtl, network, text, time, tls, vector +{ cabal, certificate, cryptoApi, cryptocipher, cryptohash, mtl +, network, text, time, tls, vector }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal certificate cryptoApi cryptocipher cryptohash mtl network - text time tls vector + certificate cryptoApi cryptocipher cryptohash mtl network text time + tls vector ]; meta = { homepage = "http://github.com/vincenthz/hs-tls-extra"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 34ed3ebf7b0..f88b752e68c 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, cereal, certificate, cryptoApi, cryptocipher -, cryptohash, mtl +{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash +, mtl }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal cereal certificate cryptoApi cryptocipher cryptohash mtl + cereal certificate cryptoApi cryptocipher cryptohash mtl ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index 59cff77cc8d..951458eb4eb 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, transformers }: +{ cabal, transformers }: cabal.mkDerivation (self: { pname = "transformers-base"; version = "0.4.1"; sha256 = "1d3w7k7smvdnnn4q6xpdhsj9zvj6372ihyhz4lrhdvgh72pfiaag"; - buildDepends = [ Cabal transformers ]; + buildDepends = [ transformers ]; meta = { homepage = "https://github.com/mvv/transformers-base"; description = "Lift computations from the bottom of a transformer stack"; diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix index 6ca938fd224..f38605c17ad 100644 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "transformers"; version = "0.2.2.0"; sha256 = "1nkazxy2p0w5ad76vg1lc4l0nla1kdqjdf9pymjgk75dpiyijbdz"; - buildDepends = [ Cabal ]; meta = { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix index 081621953fd..fa06558fc0d 100644 --- a/pkgs/development/libraries/haskell/tuple/default.nix +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, OneTuple }: +{ cabal, OneTuple }: cabal.mkDerivation (self: { pname = "tuple"; version = "0.2.0.1"; sha256 = "1c4vf798rjwshnk04avyjp4rjzj8i9qx4yksv00m3rjy6psr57xg"; - buildDepends = [ Cabal OneTuple ]; + buildDepends = [ OneTuple ]; meta = { description = "Various functions on tuples"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index 2f7031c6633..922f7bbd62f 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "type-equality"; version = "0.1.0.2"; sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q"; - buildDepends = [ Cabal ]; noHaddock = true; meta = { homepage = "http://github.com/hesselink/type-equality/"; diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index 2345c95cf93..e58da04d039 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, mtl, RepLib, transformers }: +{ cabal, mtl, RepLib, transformers }: cabal.mkDerivation (self: { pname = "unbound"; version = "0.3.1"; sha256 = "13k53dcap8knvl2qzcykx838laas34xfc0480705vzl1z9z1xppz"; - buildDepends = [ Cabal mtl RepLib transformers ]; + buildDepends = [ mtl RepLib transformers ]; noHaddock = true; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index 827fdc77b3a..e821c00f913 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, hashable, syb, unorderedContainers }: +{ cabal, hashable, syb, unorderedContainers }: cabal.mkDerivation (self: { pname = "uniplate"; version = "1.6.6"; sha256 = "1n3535yaw44v0krslnmfxgkfry6kih6sn17544qqynnz21x7dlfs"; - buildDepends = [ Cabal hashable syb unorderedContainers ]; + buildDepends = [ hashable syb unorderedContainers ]; meta = { homepage = "http://community.haskell.org/~ndm/uniplate/"; description = "Help writing simple, concise and fast generic operations"; diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix index c252e297bb7..d717bd27871 100644 --- a/pkgs/development/libraries/haskell/uniqueid/default.nix +++ b/pkgs/development/libraries/haskell/uniqueid/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "uniqueid"; version = "0.1.1"; sha256 = "e69df591c1ab9901af24bf0e63032765eb2b1ba4ca4fb720a234e9f292e03268"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/sebfisch/uniqueid/wikis"; description = "Splittable Unique Identifier Supply"; diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 46912be1c0e..83b670ee2c2 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "unix-compat"; version = "0.3.0.1"; sha256 = "09y2iih741l4jpi83c15zap94phfms4mavzg04r9rjgbav0ns2c4"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index fe44f7a7e07..da4616a1367 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, deepseq, hashable }: +{ cabal, deepseq, hashable }: cabal.mkDerivation (self: { pname = "unordered-containers"; version = "0.1.4.6"; sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d"; - buildDepends = [ Cabal deepseq hashable ]; + buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix index c3c11da805c..466d5309019 100644 --- a/pkgs/development/libraries/haskell/url/default.nix +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, utf8String }: +{ cabal, utf8String }: cabal.mkDerivation (self: { pname = "url"; version = "2.1.2"; sha256 = "2cf5c4296418afe3940ae4de66d867897b1382cc4d37a0b9a5ccffa16743ef91"; - buildDepends = [ Cabal utf8String ]; + buildDepends = [ utf8String ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Url"; description = "A library for working with URLs"; diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix index d3d05c4b7bf..59ebfe3b5e6 100644 --- a/pkgs/development/libraries/haskell/utf8-light/default.nix +++ b/pkgs/development/libraries/haskell/utf8-light/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "utf8-light"; version = "0.4.0.1"; sha256 = "1y2vfxjgq8r90bpaxhha0s837vklpwdj4cj3h61bimc0lcx22905"; - buildDepends = [ Cabal ]; meta = { description = "Unicode"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index 678e1215202..0928ae0347b 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "utf8-string"; version = "0.3.7"; sha256 = "1s59xsw1i311rpxb7arnd280pjqab5mrlfjmxbabknka8wqlnnvq"; - buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 60fa978c4a0..6b79e4cdda8 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "utility-ht"; version = "0.0.7.1"; sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma"; - buildDepends = [ Cabal ]; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 130959ce6d7..ed6701976dd 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, ListLike, time }: +{ cabal, ListLike, time }: cabal.mkDerivation (self: { pname = "uu-parsinglib"; version = "2.7.3.2"; sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60"; - buildDepends = [ Cabal ListLike time ]; + buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators"; diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index b88855f4823..38e9d27f1f0 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "uulib"; version = "0.9.14"; sha256 = "0bi62l9fp1ghqq4dagdy4nsxmm08gpsrnfgy6d6k8f4239s3yr0z"; - buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Haskell Utrecht Tools Library"; diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix index 2132911f679..ccabd8cc7fa 100644 --- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix @@ -1,5 +1,4 @@ -{ cabal, Cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo -, vacuum +{ cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo, vacuum }: cabal.mkDerivation (self: { @@ -7,7 +6,7 @@ cabal.mkDerivation (self: { version = "0.5"; sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc"; buildDepends = [ - Cabal cairo deepseq gtk strictConcurrency svgcairo vacuum + cairo deepseq gtk strictConcurrency svgcairo vacuum ]; meta = { homepage = "http://code.haskell.org/~dons/code/vacuum-cairo"; diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index f747be88cb2..1b5b5d540fd 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, ghcPaths }: +{ cabal, ghcPaths }: cabal.mkDerivation (self: { pname = "vacuum"; version = "1.0.0.2"; sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i"; - buildDepends = [ Cabal ]; extraLibraries = [ ghcPaths ]; meta = { homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/"; diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index f58f26f799a..2781de9ebe6 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "vault"; version = "0.1.0.0"; sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq"; - buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a typed, persistent store for values of arbitrary types"; diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 7f30e147ed2..6988cae0276 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, primitive, vector }: +{ cabal, primitive, vector }: cabal.mkDerivation (self: { pname = "vector-algorithms"; version = "0.5.4"; sha256 = "0j16jmnmgksbzsq2vvxjmciywi91clak77i6zjjghvn9dpmnsmv2"; - buildDepends = [ Cabal primitive vector ]; + buildDepends = [ primitive vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for vector arrays"; diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 338156736eb..b9ba9bae525 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -1,10 +1,10 @@ -{ cabal, Boolean, Cabal, MemoTrie, NumInstances }: +{ cabal, Boolean, MemoTrie, NumInstances }: cabal.mkDerivation (self: { pname = "vector-space"; version = "0.8.0"; sha256 = "1wd8psw2s98m8yfr8mam5abz2bhvxz1r78w703hgca8rr6hiaz0g"; - buildDepends = [ Boolean Cabal MemoTrie NumInstances ]; + buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { homepage = "http://haskell.org/haskellwiki/vector-space"; description = "Vector & affine spaces, linear maps, and derivatives"; diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/default.nix index 941fabb0a4b..c5c06fe93e5 100644 --- a/pkgs/development/libraries/haskell/vector/default.nix +++ b/pkgs/development/libraries/haskell/vector/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, primitive }: +{ cabal, primitive }: cabal.mkDerivation (self: { pname = "vector"; version = "0.9.1"; sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as"; - buildDepends = [ Cabal primitive ]; + buildDepends = [ primitive ]; meta = { homepage = "http://code.haskell.org/vector"; description = "Efficient Arrays"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index ab8de466c31..209eb667c77 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, deepseq, mtl, parallel, parsec, terminfo -, utf8String, vector +{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String +, vector }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "4.7.0.10"; sha256 = "03cvr4z0fvxfyrikgf89777cp1xqhy22yj83p0dysp0i5ds6cd9v"; buildDepends = [ - Cabal deepseq mtl parallel parsec terminfo utf8String vector + deepseq mtl parallel parsec terminfo utf8String vector ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 98767a51191..e7197e293f2 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,6 +1,6 @@ -{ cabal, base64Bytestring, blazeBuilder, blazeHtml, Cabal -, cryptohash, fileEmbed, httpDate, httpTypes, text, time -, transformers, unixCompat, wai +{ cabal, base64Bytestring, blazeBuilder, blazeHtml, cryptohash +, fileEmbed, httpDate, httpTypes, text, time, transformers +, unixCompat, wai }: cabal.mkDerivation (self: { @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { version = "1.1.1"; sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy"; buildDepends = [ - base64Bytestring blazeBuilder blazeHtml Cabal cryptohash fileEmbed + base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai ]; meta = { diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 6a6561a2e64..e0a36878582 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, Cabal, caseInsensitive +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive , conduit, dataDefault, fastLogger, httpTypes, network, text, time , transformers, wai, zlibConduit }: @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { version = "1.1.0"; sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55"; buildDepends = [ - blazeBuilder blazeBuilderConduit Cabal caseInsensitive conduit + blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes network text time transformers wai zlibConduit ]; diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index 21045a42acb..83b43004bc0 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, byteorder, Cabal, caseInsensitive -, fastLogger, httpTypes, network, time, wai +{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger +, httpTypes, network, time, wai }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.1.4"; sha256 = "1rvcqq4jlkcjavy8a3vf61jclwpnjmj6cp3whrzwvay9b1qfsck3"; buildDepends = [ - blazeBuilder byteorder Cabal caseInsensitive fastLogger httpTypes - network time wai + blazeBuilder byteorder caseInsensitive fastLogger httpTypes network + time wai ]; meta = { description = "A logging system for WAI"; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 09f8dcdf3dd..f1d4210b667 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, Cabal, conduit, httpTypes, network, text +{ cabal, blazeBuilder, conduit, httpTypes, network, text , transformers, vault }: @@ -7,8 +7,7 @@ cabal.mkDerivation (self: { version = "1.1.0"; sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh"; buildDepends = [ - blazeBuilder Cabal conduit httpTypes network text transformers - vault + blazeBuilder conduit httpTypes network text transformers vault ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 4b3ccff5a57..b6380981d00 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, Cabal, caseInsensitive +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive , conduit, httpTypes, liftedBase, network, simpleSendfile , transformers, unixCompat, wai }: @@ -8,9 +8,8 @@ cabal.mkDerivation (self: { version = "1.1.0"; sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf"; buildDepends = [ - blazeBuilder blazeBuilderConduit Cabal caseInsensitive conduit - httpTypes liftedBase network simpleSendfile transformers unixCompat - wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes + liftedBase network simpleSendfile transformers unixCompat wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix index 6ba4e6c27c5..7ecc85742e1 100644 --- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, pathPieces, text }: +{ cabal, pathPieces, text }: cabal.mkDerivation (self: { pname = "web-routes-quasi"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal pathPieces text ]; + buildDepends = [ pathPieces text ]; meta = { homepage = "http://docs.yesodweb.com/web-routes-quasi/"; description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 838ae3d31b4..0a6d10539e1 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, Cabal, httpTypes, mtl, network, parsec, text +{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text , utf8String }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.26.3"; sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx"; buildDepends = [ - blazeBuilder Cabal httpTypes mtl network parsec text utf8String + blazeBuilder httpTypes mtl network parsec text utf8String ]; meta = { description = "Library for maintaining correctness and composability of URLs within an application"; diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index dc852141368..5833af8efaa 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "wl-pprint-text"; version = "1.0.0.0"; sha256 = "1zvjsbn98g0lja2jj00d7mvqjq4rik7v7wsy5655wibmy0hbll90"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { description = "A Wadler/Leijen Pretty Printer for Text values"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 712f4aef3a5..450597c22e1 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, stm, wxcore }: +{ cabal, stm, wxcore }: cabal.mkDerivation (self: { pname = "wx"; version = "0.13.2.1"; sha256 = "0s5jmsrip26ahvz7mzf12m9rcibrk9is3kwbswz87h0sr0k11nbv"; - buildDepends = [ Cabal stm wxcore ]; + buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 38808b57b8b..889bc595d9d 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,12 +1,11 @@ -{ cabal, Cabal, filepath, libX11, mesa, parsec, stm, time, wxdirect -, wxGTK +{ cabal, filepath, libX11, mesa, parsec, stm, time, wxdirect, wxGTK }: cabal.mkDerivation (self: { pname = "wxcore"; version = "0.13.2.1"; sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6"; - buildDepends = [ Cabal filepath parsec stm time wxdirect ]; + buildDepends = [ filepath parsec stm time wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index d1c4a609047..b2df725223d 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, parsec, strict, time }: +{ cabal, parsec, strict, time }: cabal.mkDerivation (self: { pname = "wxdirect"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1gn5si6939yizlkf7hzm2a2gff5sa98m7q5q1hz23av98zfa8pv7"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal parsec strict time ]; + buildDepends = [ parsec strict time ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix index fd2233e2833..3c369103486 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.0.1"; sha256 = "15pcigascajky67v0lhdhn4bv8xq16cvzib05mg4f1ynwr5a9mv0"; - buildDepends = [ Cabal ]; meta = { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix index a758e19c015..33527b9affd 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.0.4"; sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw"; - buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix index 095c797da78..c5a374eb2d0 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.0.5"; sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v"; - buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 1c994cfd73d..132d3de4a8f 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,5 +1,5 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, Cabal, conduit, dataDefault, failure +, blazeBuilderConduit, conduit, dataDefault, failure , systemFilepath, text, transformers, xmlTypes }: @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { version = "0.5.2"; sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd"; buildDepends = [ - attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit Cabal + attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit conduit dataDefault failure systemFilepath text transformers xmlTypes ]; diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index 71362f44b88..c891096c205 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -1,6 +1,6 @@ { cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, blazeBuilderEnumerator, Cabal, dataDefault, enumerator, failure -, text, transformers, xmlTypes +, blazeBuilderEnumerator, dataDefault, enumerator, failure, text +, transformers, xmlTypes }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - Cabal dataDefault enumerator failure text transformers xmlTypes + dataDefault enumerator failure text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index b868199f057..721d49dc588 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "xml-types"; version = "0.3.1"; sha256 = "0ffmmidb9a1hqfbmvjxjvij2wfrqqlyjc7m7n81czrcrrsmyc1kc"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "https://john-millikin.com/software/haskell-xml/"; description = "Basic types for representing XML"; diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 050edd2d748..8a8e6e3e2ad 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, text }: +{ cabal, text }: cabal.mkDerivation (self: { pname = "xml"; version = "1.3.12"; sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai"; - buildDepends = [ Cabal text ]; + buildDepends = [ text ]; meta = { homepage = "http://code.galois.com"; description = "A simple XML library"; diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index d7389564f8c..745480ecf0c 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -1,13 +1,11 @@ -{ cabal, attoparsec, Cabal, cssText, network, tagsoup, text -, utf8String -}: +{ cabal, attoparsec, cssText, network, tagsoup, text, utf8String }: cabal.mkDerivation (self: { pname = "xss-sanitize"; version = "0.3.1"; sha256 = "0s8nqqx5f5b07xxlda4gh0w6vmlkhbqbz36cf6glhbhhyw27jkx5"; buildDepends = [ - attoparsec Cabal cssText network tagsoup text utf8String + attoparsec cssText network tagsoup text utf8String ]; meta = { homepage = "http://github.com/gregwebs/haskell-xss-sanitize"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 77c3cdbefdd..4256705fe24 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, attoparsec, Cabal, conduit, text, transformers +{ cabal, aeson, attoparsec, conduit, text, transformers , unorderedContainers, vector }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.5.2"; sha256 = "1jhzycasfmjlfdpca1cflrggc16jp16852af7d6cwfsy342wh6gp"; buildDepends = [ - aeson attoparsec Cabal conduit text transformers - unorderedContainers vector + aeson attoparsec conduit text transformers unorderedContainers + vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index 03508019b9c..62dc82b1068 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "yap"; version = "0.2"; sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i"; - buildDepends = [ Cabal ]; meta = { description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 02241f56e1d..4cb1bb336ee 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, authenticate, blazeHtml, Cabal, hamlet, httpConduit +{ cabal, aeson, authenticate, blazeHtml, hamlet, httpConduit , liftedBase, mimeMail, persistent, persistentTemplate, pureMD5 , pwstoreFast, random, SHA, shakespeareCss, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson @@ -10,10 +10,10 @@ cabal.mkDerivation (self: { version = "0.8.1.1"; sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac"; buildDepends = [ - aeson authenticate blazeHtml Cabal hamlet httpConduit liftedBase - mimeMail persistent persistentTemplate pureMD5 pwstoreFast random - SHA shakespeareCss text transformers unorderedContainers wai - yesodCore yesodForm yesodJson yesodPersistent + aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail + persistent persistentTemplate pureMD5 pwstoreFast random SHA + shakespeareCss text transformers unorderedContainers wai yesodCore + yesodForm yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 40cf254b69d..7699e4d291b 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,9 +1,9 @@ -{ cabal, aeson, blazeBuilder, blazeHtml, Cabal, caseInsensitive -, cereal, clientsession, conduit, cookie, failure, fastLogger -, hamlet, httpTypes, liftedBase, monadControl, parsec, pathPieces -, random, shakespeare, shakespeareCss, shakespeareI18n -, shakespeareJs, text, time, transformers, transformersBase, vector -, wai, waiExtra, waiLogger, yesodRoutes +{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal +, clientsession, conduit, cookie, failure, fastLogger, hamlet +, httpTypes, liftedBase, monadControl, parsec, pathPieces, random +, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text +, time, transformers, transformersBase, vector, wai, waiExtra +, waiLogger, yesodRoutes }: cabal.mkDerivation (self: { @@ -11,10 +11,10 @@ cabal.mkDerivation (self: { version = "0.10.1"; sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0"; buildDepends = [ - aeson blazeBuilder blazeHtml Cabal caseInsensitive cereal - clientsession conduit cookie failure fastLogger hamlet httpTypes - liftedBase monadControl parsec pathPieces random shakespeare - shakespeareCss shakespeareI18n shakespeareJs text time transformers + aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession + conduit cookie failure fastLogger hamlet httpTypes liftedBase + monadControl parsec pathPieces random shakespeare shakespeareCss + shakespeareI18n shakespeareJs text time transformers transformersBase vector wai waiExtra waiLogger yesodRoutes ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index 2eae95b6597..fb89b511504 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, shakespeareCss, shakespeareJs, text, transformers +{ cabal, shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, waiExtra, warp, yaml, yesodCore }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.6.1"; sha256 = "0am5f8r2w7695zfc6vi0gy8yin9kfgj37qzr14r5v6wzhk1gq5da"; buildDepends = [ - Cabal shakespeareCss shakespeareJs text transformers - unorderedContainers wai waiExtra warp yaml yesodCore + shakespeareCss shakespeareJs text transformers unorderedContainers + wai waiExtra warp yaml yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 216ab5162ca..3b1d6e9170d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeHtml, Cabal, dataDefault, emailValidate +{ cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate , hamlet, network, persistent, shakespeareCss, shakespeareJs, text , time, transformers, wai, xssSanitize, yesodCore, yesodPersistent }: @@ -8,9 +8,9 @@ cabal.mkDerivation (self: { version = "0.4.1"; sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s"; buildDepends = [ - blazeBuilder blazeHtml Cabal dataDefault emailValidate hamlet - network persistent shakespeareCss shakespeareJs text time - transformers wai xssSanitize yesodCore yesodPersistent + blazeBuilder blazeHtml dataDefault emailValidate hamlet network + persistent shakespeareCss shakespeareJs text time transformers wai + xssSanitize yesodCore yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index a092a4e8f28..66c31e868d6 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, attoparsecConduit, blazeBuilder, Cabal, conduit -, safe, shakespeareJs, text, transformers, vector, wai, waiExtra +{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, safe +, shakespeareJs, text, transformers, vector, wai, waiExtra , yesodCore, yesodRoutes }: @@ -8,9 +8,8 @@ cabal.mkDerivation (self: { version = "0.3.1"; sha256 = "17w82mfl364dc0k1zk1gqas3fyskz2jc50diq71fiw87apslva4v"; buildDepends = [ - aeson attoparsecConduit blazeBuilder Cabal conduit safe - shakespeareJs text transformers vector wai waiExtra yesodCore - yesodRoutes + aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs + text transformers vector wai waiExtra yesodCore yesodRoutes ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 005ec768bab..11a85b9cf8e 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,13 +1,11 @@ -{ cabal, Cabal, persistent, persistentTemplate, transformers -, yesodCore -}: +{ cabal, persistent, persistentTemplate, transformers, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; version = "0.3.1"; sha256 = "0pxzwqrq4wr9hdnppi5ri0iip2a8gg2y7lplmhn2791jc001ll7m"; buildDepends = [ - Cabal persistent persistentTemplate transformers yesodCore + persistent persistentTemplate transformers yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 0a840769be1..c93b5e1db8c 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, pathPieces, text, vector }: +{ cabal, pathPieces, text, vector }: cabal.mkDerivation (self: { pname = "yesod-routes"; version = "0.0.1"; sha256 = "19bnww5idxr0j2l8g838idxkhhn73bhdz0bnvglinv7163fy8xhl"; - buildDepends = [ Cabal pathPieces text vector ]; + buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 8fcaaf9627f..815932e6248 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,4 +1,4 @@ -{ cabal, base64Bytestring, Cabal, cereal, conduit, cryptoConduit +{ cabal, base64Bytestring, cereal, conduit, cryptoConduit , cryptohash, fileEmbed, httpTypes, text, transformers, unixCompat , wai, waiAppStatic, yesodCore }: @@ -8,9 +8,8 @@ cabal.mkDerivation (self: { version = "0.10.1"; sha256 = "07dapygk2n6d7sk39gwi06w96b13dqhxgx3l7ac198nil5x2m68m"; buildDepends = [ - base64Bytestring Cabal cereal conduit cryptoConduit cryptohash - fileEmbed httpTypes text transformers unixCompat wai waiAppStatic - yesodCore + base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed + httpTypes text transformers unixCompat wai waiAppStatic yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index af079e53187..f5df012fde4 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, csv, filepath, HsSyck, HStringTemplate, pandoc -, parsec, split, time, utf8String, xhtml +{ cabal, csv, filepath, HsSyck, HStringTemplate, pandoc, parsec +, split, time, utf8String, xhtml }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - Cabal csv filepath HsSyck HStringTemplate pandoc parsec split time + csv filepath HsSyck HStringTemplate pandoc parsec split time utf8String xhtml ]; meta = { diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index 7836e2fbc18..ef2eb97063a 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, zeromq }: +{ cabal, zeromq }: cabal.mkDerivation (self: { pname = "zeromq-haskell"; version = "0.8.3"; sha256 = "1gp85fbgylsqkxacgdxv4ifvgvwca03gy88raphqhrnk59bmjgzd"; - buildDepends = [ Cabal ]; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index e3fc50cacb4..865c545b783 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, Cabal, digest, filepath, mtl, utf8String, zlib }: +{ cabal, binary, digest, filepath, mtl, utf8String, zlib }: cabal.mkDerivation (self: { pname = "zip-archive"; @@ -6,9 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1q52v18kl1j049kk3yb7rp0k27p6q7r72mg1vcbdid6qd7a9dh48"; isLibrary = true; isExecutable = true; - buildDepends = [ - binary Cabal digest filepath mtl utf8String zlib - ]; + buildDepends = [ binary digest filepath mtl utf8String zlib ]; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 57f3ee199ae..c36def2683c 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, multirec }: +{ cabal, multirec }: cabal.mkDerivation (self: { pname = "zipper"; version = "0.4.1"; sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi"; - buildDepends = [ Cabal multirec ]; + buildDepends = [ multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic zipper for families of recursive datatypes"; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 79a72eacd96..a2240ca327c 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, zlib }: +{ cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib-bindings"; version = "0.0.3.2"; sha256 = "0x78fkjinfhhihhfihr0g5rc4d8jkhza3vw5qsyds74skd6rsy1q"; - buildDepends = [ Cabal zlib ]; + buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; description = "Low-level bindings to the zlib package"; diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index 2b7204e104b..decdd32676a 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, conduit, transformers, zlibBindings }: +{ cabal, conduit, transformers, zlibBindings }: cabal.mkDerivation (self: { pname = "zlib-conduit"; version = "0.2.0"; sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk"; - buildDepends = [ Cabal conduit transformers zlibBindings ]; + buildDepends = [ conduit transformers zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits"; diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index e7c73c60518..3e99ed8d5c9 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, enumerator, transformers, zlibBindings }: +{ cabal, enumerator, transformers, zlibBindings }: cabal.mkDerivation (self: { pname = "zlib-enum"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0cnx7sbgj6s0gvq6pcqyi3xahx7x3bj47ap10z89qfbk0906rkq8"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal enumerator transformers zlibBindings ]; + buildDepends = [ enumerator transformers zlibBindings ]; meta = { homepage = "http://github.com/maltem/zlib-enum"; description = "Enumerator interface for zlib compression"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix index a8a06bbd361..60f81e7f984 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, zlib }: +{ cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.0.0"; sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891"; - buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix index 87b60d13654..5ec59a9690f 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, zlib }: +{ cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.2.0"; sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; - buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix index 51cbe77722f..f4355c0a954 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, zlib }: +{ cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.3.1"; sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq"; - buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index c632b91b114..909754db3e7 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -1,10 +1,9 @@ -{ cabal, Cabal, zlib }: +{ cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.3.3"; sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; - buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index 6f3ac738bff..b269ebb4a88 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, Cabal, happyMeta, haskellSrcMeta }: +{ cabal, alexMeta, happyMeta, haskellSrcMeta }: cabal.mkDerivation (self: { pname = "BNFC-meta"; version = "0.2.2"; sha256 = "07jfc0dcrcckibbw0xca1h7x3lnc9jfylfkcs23f0hyg31irf8dx"; - buildDepends = [ alexMeta Cabal happyMeta haskellSrcMeta ]; + buildDepends = [ alexMeta 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 12357617ae8..c06b5eacc24 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "BNFC"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal mtl ]; + buildDepends = [ 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 74e621fa8d9..cd36d5f58e9 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, hint, mtl, network, syb }: +{ 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 = [ Cabal filepath hint mtl network syb ]; + buildDepends = [ 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/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 6fe78ac9c7c..5ec29160bb4 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haskellSrcMeta }: +{ cabal, haskellSrcMeta }: cabal.mkDerivation (self: { pname = "alex-meta"; version = "0.2.0.2"; sha256 = "1v47p1nrx2nb92aasq7ml6i0sy1nfyybgm9n4r1sw1g86dg1y8z1"; - buildDepends = [ Cabal haskellSrcMeta ]; + buildDepends = [ haskellSrcMeta ]; meta = { description = "Quasi-quoter for Alex lexers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index f89f22d6cbd..a57ff5f6b88 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haskellSrcMeta, mtl }: +{ cabal, haskellSrcMeta, mtl }: cabal.mkDerivation (self: { pname = "happy-meta"; version = "0.2.0.3"; sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9"; - buildDepends = [ Cabal haskellSrcMeta mtl ]; + buildDepends = [ 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 42f6135856d..76e102ff69c 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, cpphs, filepath, haskellSrcExts, hscolour -, transformers, uniplate +{ cabal, cpphs, filepath, haskellSrcExts, hscolour, transformers +, uniplate }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal cpphs filepath haskellSrcExts hscolour transformers uniplate + 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 16125b5b115..78863fab185 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, network, time }: +{ cabal, mtl, network, time }: cabal.mkDerivation (self: { pname = "hslogger"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0lk966csxxyjjdg5jg4pzzl5118zj8ms78vn1n9imb7f4vcs8vk7"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal mtl network time ]; + buildDepends = [ 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 02db9131f8a..ec1ea4f4226 100644 --- a/pkgs/development/tools/haskell/tar/0.3.2.0.nix +++ b/pkgs/development/tools/haskell/tar/0.3.2.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "tar"; version = "0.3.2.0"; sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ 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 ebabfc2a6f2..bc259cf5acf 100644 --- a/pkgs/development/tools/haskell/tar/0.4.0.0.nix +++ b/pkgs/development/tools/haskell/tar/0.4.0.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "tar"; version = "0.4.0.0"; sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ 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 84475081014..e6cf8347243 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, Cabal, cairo, deepseq, filepath, ghcEvents, glib -, gtk, mtl, pango, time +{ cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk +, mtl, pango, time }: cabal.mkDerivation (self: { @@ -9,8 +9,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - binary Cabal cairo deepseq filepath ghcEvents glib gtk mtl pango - time + binary 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 0705d1d0a3d..749fbb6978d 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, haskellSrcExts, mtl, uulib }: +{ 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 = [ Cabal filepath haskellSrcExts mtl uulib ]; + buildDepends = [ 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/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 277e7f6c273..81178166c76 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,5 +1,5 @@ -{ cabal, Cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap -, uuagcCabal, uulib +{ cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal +, uulib }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Cabal filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib + filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index fb32004497a..7dd3cf61a82 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal }: +{ cabal }: cabal.mkDerivation (self: { pname = "cpphs"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "1dnz4992hr662ys1lkf6iyqmi2a3bksim8dlryqwd9wx9h24lhq2"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal ]; meta = { homepage = "http://haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 2e8bea4360d..81815500c61 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, happy }: +{ cabal, happy }: cabal.mkDerivation (self: { pname = "Ebnf2ps"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal ]; buildTools = [ happy ]; meta = { homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix index c47c502611d..fd239d580bf 100644 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ b/pkgs/development/tools/parsing/alex/2.3.1.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, perl }: +{ cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix index e00ec723151..d3a4778f3f3 100644 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ b/pkgs/development/tools/parsing/alex/2.3.2.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, perl }: +{ cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix index f275255fcb0..c9e7671c944 100644 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ b/pkgs/development/tools/parsing/alex/2.3.3.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, perl }: +{ cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix index 50b04c64dec..db676a90684 100644 --- a/pkgs/development/tools/parsing/alex/2.3.5.nix +++ b/pkgs/development/tools/parsing/alex/2.3.5.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, perl }: +{ cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0lyjiq4lmii2syk6838ln32qvn8c0ljf1ypsggahy748k05x79if"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix index 41838555133..6725fed5279 100644 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, perl, QuickCheck }: +{ cabal, perl, QuickCheck }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal QuickCheck ]; + buildDepends = [ QuickCheck ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix index 4f8b3024ea5..cc5c60a3d43 100644 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ b/pkgs/development/tools/parsing/happy/1.18.4.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, perl }: +{ cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix index 9b0b2721f67..41532651c99 100644 --- a/pkgs/development/tools/parsing/happy/1.18.5.nix +++ b/pkgs/development/tools/parsing/happy/1.18.5.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, perl }: +{ cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix index 161c87e2d1d..60b8d253659 100644 --- a/pkgs/development/tools/parsing/happy/1.18.6.nix +++ b/pkgs/development/tools/parsing/happy/1.18.6.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, perl }: +{ cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0q6dnwihi1q761qdq0hhi733nh5d53xz6frwmr7slpvrp6v8y344"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix index 282967a55b2..b1ba0b165dd 100644 --- a/pkgs/development/tools/parsing/happy/1.18.8.nix +++ b/pkgs/development/tools/parsing/happy/1.18.8.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, perl }: +{ cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix index 13f04fa3345..cb47eaa8bdb 100644 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ b/pkgs/development/tools/parsing/happy/1.18.9.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, mtl, perl }: +{ cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "12k1rg7dqa02az9d1zasdnp51zs4h30kpi5lyqsw3jxfp09cad3x"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal mtl ]; + buildDepends = [ mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index abd9b5d4892..dc82a1a000a 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,6 +1,4 @@ -{ cabal, binary, Cabal, ConfigFile, filepath, gtk, mtl, random -, zlib -}: +{ cabal, binary, ConfigFile, filepath, gtk, mtl, random, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; @@ -8,9 +6,7 @@ cabal.mkDerivation (self: { sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c"; isLibrary = true; isExecutable = true; - buildDepends = [ - binary Cabal ConfigFile filepath gtk mtl random zlib - ]; + buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ]; meta = { homepage = "http://github.com/kosmikus/LambdaHack"; description = "A roguelike game engine in early and very active development"; diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix index 2f253561526..92c7a17d7d9 100644 --- a/pkgs/games/MazesOfMonad/default.nix +++ b/pkgs/games/MazesOfMonad/default.nix @@ -1,4 +1,4 @@ -{ cabal, Cabal, filepath, HUnit, mtl, random, regexPosix, time }: +{ cabal, filepath, HUnit, mtl, random, regexPosix, time }: cabal.mkDerivation (self: { pname = "MazesOfMonad"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1zk6bckll03b40iq8z13753glkmcan6439w8cc6rn5h2fhp189v9"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal filepath HUnit mtl random regexPosix time ]; + buildDepends = [ filepath HUnit mtl random regexPosix time ]; meta = { description = "Console-based Role Playing Game"; license = self.stdenv.lib.licenses.bsd3; |