diff options
Diffstat (limited to 'pkgs/development')
33 files changed, 147 insertions, 105 deletions
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index c610e8418270b..a61f07aaac38f 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, happy, gmp, boehmgc }: +{ cabal, boehmgc, gmp, happy, mtl }: cabal.mkDerivation (self: { pname = "epic"; @@ -7,9 +7,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; + buildTools = [ happy ]; extraLibraries = [ gmp boehmgc ]; noHaddock = true; - buildTools = [ happy ]; meta = { homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php"; description = "Compiler for a simple functional language"; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 769a8d3fc2395..48346e9910734 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, epic, ivor, mtl, parsec, readline, happy }: +{ cabal, binary, epic, happy, ivor, mtl, parsec, readline }: cabal.mkDerivation (self: { pname = "idris"; 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 177748816ac8a..8ffc0f1aed644 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -1,10 +1,11 @@ -{cabal, OpenGL, glut, libSM, libICE, libXmu, libXi, mesa}: +{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.1.1.2"; # Haskell Platform 2009.0.0 + version = "2.1.1.2"; sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; - propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa]; + buildDepends = [ OpenGL ]; + extraLibraries = [ glut libSM libICE libXmu libXi mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL Utility Toolkit"; 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 ef90cc063dc91..aca2dc19cad27 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -1,10 +1,11 @@ -{cabal, OpenGL, glut, libSM, libICE, libXmu, libXi, mesa}: +{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.1.2.1"; # Haskell Platform 2010.1.0.0, 2010.2.0.0, 2011.2.0.0 + version = "2.1.2.1"; sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; - propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa]; + buildDepends = [ OpenGL ]; + extraLibraries = [ glut libSM libICE libXmu libXi mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix index a9bb5d87bd344..f2f18caff04a3 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix @@ -1,11 +1,13 @@ -{ cabal, glut, OpenGL, StateVar, Tensor, libSM, libICE, libXmu, libXi, mesa }: +{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL, StateVar +, Tensor +}: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.2.2.0"; sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx"; buildDepends = [ OpenGL StateVar Tensor ]; - extraLibraries = [ glut libSM libICE libXmu libXi mesa ]; + extraLibraries = [ glut libSM libICE libXmu libXi mesa glut ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index 32b91a6ae64ea..a4a77aa824419 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,10 +1,11 @@ -{cabal, ObjectName, StateVar, Tensor, openal} : +{ cabal, ObjectName, openal, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "OpenAL"; version = "1.4.0.0"; sha256 = "1vn9r8fd4zwqm8a9d8bgvi9vs1lmygn8sw1rlv819b5wmjwz3ms2"; - propagatedBuildInputs = [ ObjectName StateVar Tensor openal ]; + buildDepends = [ ObjectName StateVar Tensor ]; + extraLibraries = [ openal ]; meta = { homepage = "http://connect.creativelabs.com/openal/"; description = "A binding to the OpenAL cross-platform 3D audio API"; 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 6b097d821c9b8..42d89fef85a76 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,10 @@ -{cabal, mesa, libX11}: +{ cabal, libX11, mesa }: cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.2.1.1"; # Haskell Platform 2009.0.0 + version = "2.2.1.1"; sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792"; - propagatedBuildInputs = [mesa libX11]; + extraLibraries = [ mesa libX11 ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL graphics system"; 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 327d000202262..a18ef0670d5c4 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,10 @@ -{cabal, mesa, libX11}: +{ cabal, libX11, mesa }: cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.2.3.0"; # Haskell Platform 2010.1.0.0, 2010.2.0.0, 2011.2.0.0 + version = "2.2.3.0"; sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57"; - propagatedBuildInputs = [mesa libX11]; + extraLibraries = [ mesa libX11 ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "A binding for the OpenGL graphics system"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix index 9074ecb3015e0..e03848a0669a7 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix @@ -1,4 +1,6 @@ -{ cabal, GLURaw, ObjectName, OpenGLRaw, StateVar, Tensor, mesa, libX11 }: +{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar +, Tensor +}: cabal.mkDerivation (self: { pname = "OpenGL"; diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix index 0f2c3700a48b5..e6695f0135801 100644 --- a/pkgs/development/libraries/haskell/SDL-image/default.nix +++ b/pkgs/development/libraries/haskell/SDL-image/default.nix @@ -1,10 +1,11 @@ -{cabal, SDL, SDL_image} : +{ cabal, SDL, SDL_image }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "SDL-image"; version = "0.6.1"; sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni"; - propagatedBuildInputs = [ SDL SDL_image ]; + buildDepends = [ SDL ]; + extraLibraries = [ SDL_image ]; meta = { description = "Binding to libSDL_image"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix index 0847068b26785..674282e30a869 100644 --- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix +++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix @@ -1,10 +1,11 @@ -{cabal, SDL, SDL_mixer} : +{ cabal, SDL, SDL_mixer }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "SDL-mixer"; version = "0.6.1"; sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1"; - propagatedBuildInputs = [ SDL SDL_mixer ]; + buildDepends = [ SDL ]; + extraLibraries = [ SDL_mixer ]; meta = { description = "Binding to libSDL_mixer"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index 7678c7af4f5df..f48e0dbab510f 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -1,10 +1,11 @@ -{cabal, SDL, SDL_ttf} : +{ cabal, SDL, SDL_ttf }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "SDL-ttf"; version = "0.6.1"; sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal"; - propagatedBuildInputs = [ SDL SDL_ttf ]; + buildDepends = [ SDL ]; + extraLibraries = [ SDL_ttf ]; meta = { description = "Binding to libSDL_ttf"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 70ed5a6c36e88..7716edecf1981 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,12 +1,15 @@ -{cabal, gtk2hsBuildtools, pkgconfig, glibc, cairo, zlib, mtl}: +{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "cairo"; version = "0.12.0"; sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9"; - extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools]; - propagatedBuildInputs = [mtl]; + buildDepends = [ mtl ]; + buildTools = [ gtk2hsBuildtools ]; + extraLibraries = [ pkgconfig glibc cairo zlib ]; + pkgconfigDepends = [ cairo ]; meta = { + homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the Cairo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix index 51f03bebb89c1..b8fe0d25ed419 100644 --- a/pkgs/development/libraries/haskell/editline/default.nix +++ b/pkgs/development/libraries/haskell/editline/default.nix @@ -1,10 +1,10 @@ -{ cabal, libedit } : +{ cabal, libedit }: cabal.mkDerivation (self: { pname = "editline"; version = "0.2.1.0"; sha256 = "83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1"; - propagatedBuildInputs = [ libedit ]; + extraLibraries = [ libedit ]; meta = { homepage = "http://code.haskell.org/editline"; description = "Bindings to the editline library (libedit)"; @@ -16,4 +16,3 @@ cabal.mkDerivation (self: { ]; }; }) - diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index a926a27beb560..331d7336dbb38 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -1,11 +1,15 @@ -{cabal, cairo, glib, gtk, mtl, pango, gtk2hsBuildtools, pkgconfig, gnome, glibc}: +{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, gtkC, libglade +, mtl, pango, pkgconfig +}: cabal.mkDerivation (self: { pname = "glade"; version = "0.12.0"; sha256 = "0h7l1kp9y17xqyz16kv0dvwgblph9r70wimyl8aq9gi1r4is5lmq"; - extraBuildInputs = [pkgconfig gtk2hsBuildtools gnome.libglade gnome.gtk glibc]; - propagatedBuildInputs = [cairo glib gtk mtl pango]; + buildDepends = [ cairo glib gtk mtl pango ]; + buildTools = [ gtk2hsBuildtools ]; + extraLibraries = [ pkgconfig glibc ]; + pkgconfigDepends = [ gtkC libglade ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the glade library"; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 87fc2ea031afc..25d743c3ba890 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -1,10 +1,12 @@ -{cabal, gtk2hsBuildtools, pkgconfig, glib, glibc}: +{ cabal, glib, glibc, gtk2hsBuildtools, pkgconfig }: cabal.mkDerivation (self: { pname = "glib"; version = "0.12.0"; sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19"; - extraBuildInputs = [pkgconfig glib glibc gtk2hsBuildtools]; + buildTools = [ gtk2hsBuildtools ]; + extraLibraries = [ pkgconfig glibc ]; + pkgconfigDepends = [ glib ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the GLIB library for Gtk2Hs"; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 5eb23f8bc5405..7f7d762bbf540 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -1,11 +1,15 @@ -{cabal, cairo, glib, mtl, pango, gtk2hsBuildtools, pkgconfig, gtk, glibc}: +{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, mtl, pango +, pkgconfig +}: cabal.mkDerivation (self: { pname = "gtk"; version = "0.12.0"; sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2"; - extraBuildInputs = [pkgconfig gtk2hsBuildtools gtk glibc]; - propagatedBuildInputs = [cairo glib mtl pango]; + buildDepends = [ cairo glib mtl pango ]; + buildTools = [ gtk2hsBuildtools ]; + extraLibraries = [ pkgconfig glibc ]; + pkgconfigDepends = [ glib gtk ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 5262b8ee9cc3a..902fc24b2b783 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -1,11 +1,15 @@ -{cabal, gtk2hsBuildtools, pkgconfig, gtksourceview, glib, gtk, gtkC, glibc}: +{ cabal, glib, glibc, gtk, gtk2hsBuildtools, gtksourceview, mtl +, pkgconfig +}: cabal.mkDerivation (self: { pname = "gtksourceview2"; version = "0.12.2"; sha256 = "0l9y48kmzqzps6k54fgf0dkmmv0ppxx8amggfdswwk86zsf8j81r"; - extraBuildInputs = [pkgconfig gtksourceview gtkC glibc gtk2hsBuildtools]; - propagatedBuildInputs = [glib gtk]; + buildDepends = [ glib gtk mtl ]; + buildTools = [ gtk2hsBuildtools ]; + extraLibraries = [ pkgconfig glibc ]; + pkgconfigDepends = [ gtksourceview ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; 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 55e347437cbb4..0bec73765444c 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,10 @@ -{cabal, happy}: +{ cabal, happy }: cabal.mkDerivation (self: { pname = "haskell-src"; - version = "1.0.1.3"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 + version = "1.0.1.3"; sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89"; - extraBuildInputs = [happy]; + buildTools = [ happy ]; meta = { description = "Manipulating Haskell source code"; license = self.stdenv.lib.licenses.bsd3; 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 bb2865d612946..949efadea96af 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,11 +1,11 @@ -{cabal, happy, syb}: +{ cabal, happy, syb }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "haskell-src"; - version = "1.0.1.4"; # Haskell Platform 2011.2.0.0 + version = "1.0.1.4"; sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j"; - extraBuildInputs = [happy]; - propagatedBuildInputs = [syb]; + buildDepends = [ syb ]; + buildTools = [ happy ]; meta = { description = "Support for manipulating Haskell source code"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 2a695fab9a1dd..8f2037cdbd46d 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -1,13 +1,15 @@ -{cabal, HUnit, QuickCheck, binary, storableComplex, vector, gsl, liblapack, blas} : +{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random +, storableComplex, vector +}: cabal.mkDerivation (self: { pname = "hmatrix"; version = "0.11.1.0"; sha256 = "19915xmf6m2092s1rzwirxy0rwjcr6482y5wg4bil0afm0xjnb9n"; - propagatedBuildInputs = [ - HUnit QuickCheck binary storableComplex vector - gsl liblapack blas + buildDepends = [ + binary HUnit QuickCheck random storableComplex vector ]; + extraLibraries = [ gsl liblapack blas ]; meta = { homepage = "http://perception.inf.um.es/hmatrix"; description = "Linear algebra and numerical computation"; diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index eb7b13986b716..4dd915db7d372 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -1,10 +1,13 @@ -{cabal, GLUT, OpenGL, hp2anyCore, network, parseargs}: +{ cabal, GLUT, glut, hp2anyCore, network, OpenGL, parseargs }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "hp2any-graph"; version = "0.5.3"; sha256 = "1al20pxfgkgwynrx7vr0i57342s91lcm3cnd9qjx8b6vkqmzykkq"; - propagatedBuildInputs = [GLUT OpenGL hp2anyCore network parseargs]; + isLibrary = true; + isExecutable = true; + buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ]; + extraLibraries = [ glut ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 895a44b383e71..6e2cd31023200 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -1,11 +1,15 @@ -{cabal, cairo, glib, mtl, gtk2hsBuildtools, pkgconfig, pango, glibc}: +{ cabal, cairo, glib, glibc, gtk2hsBuildtools, mtl, pango +, pkgconfig +}: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "pango"; version = "0.12.0"; sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb"; - extraBuildInputs = [pkgconfig gtk2hsBuildtools pango glibc]; - propagatedBuildInputs = [cairo glib mtl]; + buildDepends = [ cairo glib mtl ]; + buildTools = [ gtk2hsBuildtools ]; + extraLibraries = [ pkgconfig glibc ]; + pkgconfigDepends = [ cairo pango ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 083a3fbe48dc6..04f75ae8c5706 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -1,4 +1,4 @@ -{ cabal, repa, repaAlgorithms, repaIo, vector, llvm }: +{ cabal, llvm, random, repa, repaAlgorithms, repaIo, vector }: cabal.mkDerivation (self: { pname = "repa-examples"; @@ -6,7 +6,8 @@ cabal.mkDerivation (self: { sha256 = "056y2x8kada4d6a89sni2469c736z3d9ldp188n3i58h4kjqqfq7"; isLibrary = false; isExecutable = true; - buildDepends = [ repa repaAlgorithms repaIo vector llvm ]; + buildDepends = [ random repa repaAlgorithms repaIo vector ]; + extraLibraries = [ llvm ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 55227465197c0..007b17507bf5e 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -1,11 +1,13 @@ -{cabal, gtk2hsBuildtools, cairo, glib, mtl, pkgconfig, librsvg, glibc}: +{ cabal, cairo, glib, glibc, gtk2hsBuildtools, librsvg, mtl }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "svgcairo"; version = "0.12.0"; sha256 = "1zialw59njmq0sfz9f0rx6v50d4bvld2ivmwljkp5bmxii3hcjl3"; - extraBuildInputs = [pkgconfig librsvg glibc gtk2hsBuildtools]; - propagatedBuildInputs = [cairo glib mtl]; + buildDepends = [ cairo glib mtl ]; + buildTools = [ gtk2hsBuildtools ]; + extraLibraries = [ glibc ]; + pkgconfigDepends = [ cairo librsvg ]; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the libsvg-cairo library"; diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 50130190da018..960e90d645d87 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -1,10 +1,10 @@ -{cabal, ghcPaths}: +{ cabal, ghcPaths }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "vacuum"; version = "1.0.0"; sha256 = "2229948ce801052c5ffb70ffc07e301d87d60740b053df8a7b7851ad02c01d9f"; - propagatedBuildInputs = [ghcPaths]; + extraLibraries = [ ghcPaths ]; meta = { homepage = "http://moonpatio.com/vacuum/"; description = "Extract graph representations of ghc heap values"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 29e2aff80ee7d..81f279311c9b9 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,11 +1,11 @@ -{cabal, parsec, stm, wxdirect, wxGTK, mesa, libX11}: +{ cabal, libX11, mesa, parsec, stm, time, wxdirect, wxGTK }: - -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "wxcore"; version = "0.12.1.7"; sha256 = "12vs449xg2xjp503ywjwxadan3v7dq38ph66292szwj1vmhl07v4"; - propagatedBuildInputs = [ parsec stm wxdirect wxGTK mesa libX11]; + buildDepends = [ parsec stm time wxdirect ]; + extraLibraries = [ wxGTK mesa libX11 ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix index 91bc055941588..226a4fd676e38 100644 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix @@ -1,12 +1,12 @@ -{cabal, ghcPaths, libedit}: +{ cabal, ghcPaths }: cabal.mkDerivation (self: { pname = "haddock"; - version = "2.4.2"; # Haskell Platform 2009.0.0 - name = self.fname; + version = "2.4.2"; sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547"; - # TODO: adding libedit here is a hack - propagatedBuildInputs = [ghcPaths libedit]; + isLibrary = true; + isExecutable = true; + buildDepends = [ ghcPaths ]; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix index f225d29e3dc99..fd239d580bf3f 100644 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ b/pkgs/development/tools/parsing/alex/2.3.1.nix @@ -1,11 +1,12 @@ -{cabal, perl}: +{ cabal, perl }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "alex"; - version = "2.3.1"; # Haskell Platform 2009.0.0 - name = self.fname; + version = "2.3.1"; sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44"; - extraBuildInputs = [perl]; + isLibrary = false; + isExecutable = true; + buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix index 5bba51ec936b1..d3a4778f3f32b 100644 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ b/pkgs/development/tools/parsing/alex/2.3.2.nix @@ -1,11 +1,12 @@ -{cabal, perl}: +{ cabal, perl }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "alex"; - version = "2.3.2"; # Haskell Platform 2010.1.0.0 - name = self.fname; + version = "2.3.2"; sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43"; - extraBuildInputs = [perl]; + isLibrary = false; + isExecutable = true; + buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix index 578c32f3cf14c..c9e7671c94478 100644 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ b/pkgs/development/tools/parsing/alex/2.3.3.nix @@ -1,11 +1,12 @@ -{cabal, perl}: +{ cabal, perl }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "alex"; - version = "2.3.3"; # Haskell Platform 2010.2.0.0 - name = self.fname; + version = "2.3.3"; sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8"; - extraBuildInputs = [perl]; + isLibrary = false; + isExecutable = true; + buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix index 98b76c6b2f034..db676a906849e 100644 --- a/pkgs/development/tools/parsing/alex/2.3.5.nix +++ b/pkgs/development/tools/parsing/alex/2.3.5.nix @@ -1,11 +1,12 @@ -{cabal, perl}: +{ cabal, perl }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "alex"; - version = "2.3.5"; # Haskell Platform 2011.2.0.0 - name = self.fname; + version = "2.3.5"; sha256 = "0lyjiq4lmii2syk6838ln32qvn8c0ljf1ypsggahy748k05x79if"; - extraBuildInputs = [perl]; + isLibrary = false; + isExecutable = true; + buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix index 25b19544251f7..6725fed527976 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, QuickCheck, perl }: +{ cabal, perl, QuickCheck }: cabal.mkDerivation (self: { pname = "alex"; |