diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix index eb7c3f066e9d..f89b29d95f11 100644 --- a/pkgs/applications/version-management/darcs/darcs-2.nix +++ b/pkgs/applications/version-management/darcs/darcs-2.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self : { pname = "darcs"; name = self.fname; - version = "2.5"; - sha256 = "0i99z3wsfc1hhr0a0ax7254gj3i69yg8cb9lhp55wl6lfqvpzcnh"; + version = "2.5.1"; + sha256 = "0h7i2nw1fkmdrvwgzccqvbbfx8bdhn0h9d5rd98ayjs207dnvrj8"; propagatedBuildInputs = [ curl html parsec regexCompat haskeline hashedStorage zlib tar text diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index 52cfe1e9798d..5380db40c022 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -1,11 +1,12 @@ -{cabal, X11, mtl, xmessage}: +{cabal, X11, mtl, xmessage, syb}: cabal.mkDerivation (self : { pname = "xmonad"; name = "${self.fname}"; - version = "0.9.1"; - sha256 = "014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927"; - propagatedBuildInputs = [X11 mtl]; + version = "0.9.2"; + sha256 = "07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd"; + noHaddock = true; + propagatedBuildInputs = [X11 mtl syb]; meta = { description = "xmonad is a tiling window manager for X"; homepage = http://xmonad.org/; diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 1c0619356e05..a8b39e6e5b0d 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -2,9 +2,8 @@ cabal.mkDerivation (self : { pname = "xmonad-contrib"; - name = "${self.fname}"; - version = "0.9.1"; - sha256 = "b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47"; + version = "0.9.2"; + sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p"; propagatedBuildInputs = [X11 xmonad utf8String X11Xft]; meta = { description = "a huge extension library for xmonad"; diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index c0493ecec992..160925482a4a 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -1,13 +1,15 @@ -{cabal, QuickCheck, binary, haskeline, haskellSrc, mtl, utf8String, xhtml, zlib, +{cabal, QuickCheck, binary, haskeline, haskellSrcExts, mtl, utf8String, + syb, xhtml, zlib, happy, alex}: cabal.mkDerivation (self : { pname = "Agda"; - version = "2.2.8"; - sha256 = "06j2s7x3h5lanygd6mhhxkzjf4c0m8pw6c0s7gbmwlxqrkz9firg"; + version = "2.2.10"; + sha256 = "1bh96g5c6b6jzaf3m9gm0vr64avgi86kb45p8i1vg1jbfjdbdlsw"; extraBuildInputs = [happy alex]; propagatedBuildInputs = - [QuickCheck binary haskeline haskellSrc mtl utf8String xhtml zlib]; + [QuickCheck binary haskeline haskellSrcExts mtl utf8String + syb xhtml zlib]; meta = { description = "A dependently typed functional language and proof assistant"; maintainers = [self.stdenv.lib.maintainers.andres]; diff --git a/pkgs/development/libraries/haskell/GLUT/default.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/GLUT/default.nix rename to pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix 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 0b0b04b2a901..5ac0b612e631 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "GLUT"; - version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 - sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264"; + version = "2.1.2.1"; # Haskell Platform 2010.1.0.0, 2010.2.0.0, 2011.2.0.0 + sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa]; meta = { description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-Data.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-Data.nix deleted file mode 100644 index e41cd9515a83..000000000000 --- a/pkgs/development/libraries/haskell/HAppS/HAppS-Data.nix +++ /dev/null @@ -1,25 +0,0 @@ -{cabal, mtl, sybWithClass, HaXml, HAppSUtil, bytestring, binary}: - -cabal.mkDerivation (self : { - pname = "HAppS-Data"; - version = "0.9.3"; - sha256 = "b23c6f4a949927194e47f9781edc3b7d38513210de4a24987859d68b375bc335"; - propagatedBuildInputs = [mtl sybWithClass HaXml HAppSUtil bytestring binary]; - meta = { - description = ''HAppS data manipulation libraries''; - longDescription = '' - This package provides libraries for: - - * Deriving instances for your datatypes. - - * Producing default values of Haskell datatypes. - - * Normalizing values of Haskell datatypes. - - * Marshalling Haskell values to and from XML. - - * Marshalling Haskell values to and from HTML forms. - ''; - license = "free"; - }; -}) diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-IxSet.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-IxSet.nix deleted file mode 100644 index 57aafa82eb45..000000000000 --- a/pkgs/development/libraries/haskell/HAppS/HAppS-IxSet.nix +++ /dev/null @@ -1,12 +0,0 @@ -{cabal, mtl, hslogger, HAppSUtil, HAppSState, HAppSData, sybWithClass}: - -cabal.mkDerivation (self : { - pname = "HAppS-IxSet"; - version = "0.9.3"; - sha256 = "ebacd72e153bbcafb18bf4fa607550de98f8a991e9cfd8314b572cacf155a372"; - propagatedBuildInputs = [mtl hslogger HAppSUtil HAppSState HAppSData sybWithClass]; - meta = { - longDescription = ''Web framework''; - license = "free"; - }; -}) diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-Server.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-Server.nix deleted file mode 100644 index 02b3b58f73a3..000000000000 --- a/pkgs/development/libraries/haskell/HAppS/HAppS-Server.nix +++ /dev/null @@ -1,13 +0,0 @@ -{cabal, HaXml, parsec, mtl, network, hslogger, HAppSData, HAppSUtil, HAppSState, HAppSIxSet, HTTP, xhtml, html, bytestring}: - -cabal.mkDerivation (self : { - pname = "HAppS-Server"; - version = "0.9.3.1"; - sha256 = "b03129f332c35cd558b0f32bc626321dcfa2647dd7ddf67f3403eca8c4c52038"; - propagatedBuildInputs = [HaXml parsec mtl network hslogger HAppSData HAppSUtil HAppSState HAppSIxSet HTTP xhtml html bytestring]; - meta = { - description = ''Web related tools and services.''; - longDescription = ''Web framework''; - license = "free"; - }; -}) diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-State.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-State.nix deleted file mode 100644 index 04fea3f778a0..000000000000 --- a/pkgs/development/libraries/haskell/HAppS/HAppS-State.nix +++ /dev/null @@ -1,13 +0,0 @@ -{cabal, HaXml, mtl, network, stm, hslogger, HAppSUtil, HAppSData, bytestring, binary, hspread}: - -cabal.mkDerivation (self : { - pname = "HAppS-State"; - version = "0.9.3"; - sha256 = "5099e635f8fcf56f775947a241a24e1aab6eb6d9fee0406e6a2169c4c8b331e4"; - propagatedBuildInputs = [HaXml mtl network stm hslogger HAppSUtil HAppSData bytestring binary hspread]; - meta = { - description = ''Event-based distributed state.''; - longDescription = ''Web framework''; - license = "free"; - }; -}) diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-Util.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-Util.nix deleted file mode 100644 index 9f55cc2fa6da..000000000000 --- a/pkgs/development/libraries/haskell/HAppS/HAppS-Util.nix +++ /dev/null @@ -1,12 +0,0 @@ -{cabal, mtl, hslogger, bytestring}: - -cabal.mkDerivation (self : { - pname = "HAppS-Util"; - version = "0.9.3"; - sha256 = "f9120d256e37111b6203dfc4eb598dd438c87e53bb9eb37258c999dd49b8e655"; - propagatedBuildInputs = [mtl hslogger bytestring]; - meta = { - description = ''Web framework''; - license = "free"; - }; -}) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 0d9c34b890e6..40909a25cce5 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,10 +1,10 @@ -{cabal, parsec, time, text, utf8String, parallel}: +{cabal, parsec, time, text, utf8String, parallel, syb}: cabal.mkDerivation (self : { pname = "HStringTemplate"; - version = "0.6.5"; - sha256 = "e40b69e22900f381ca7fb080ea6e70d623e52e909bd7b896bc24e15c8e43252c"; - propagatedBuildInputs = [parsec time text utf8String parallel]; + version = "0.6.6"; + sha256 = "1ian79az5q6m08pwb5fks52ffs4h2mq02kkcwmr6jb7i0ha2k2si"; + propagatedBuildInputs = [parsec time text utf8String parallel syb]; meta = { description = "StringTemplate implementation in Haskell"; }; diff --git a/pkgs/development/libraries/haskell/HTTP/3001.nix b/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix similarity index 100% rename from pkgs/development/libraries/haskell/HTTP/3001.nix rename to pkgs/development/libraries/haskell/HTTP/3001.1.5.nix diff --git a/pkgs/development/libraries/haskell/HTTP/default.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix similarity index 100% rename from pkgs/development/libraries/haskell/HTTP/default.nix rename to pkgs/development/libraries/haskell/HTTP/4000.0.6.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix new file mode 100644 index 000000000000..686ca44654ea --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec}: + +cabal.mkDerivation (self : { + pname = "HTTP"; + version = "4000.1.1"; # Haskell Platform 2011.2.0.0 + sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; + propagatedBuildInputs = [mtl network parsec]; + meta = { + description = "a Haskell library for client-side HTTP"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HUnit/default.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix similarity index 100% rename from pkgs/development/libraries/haskell/HUnit/default.nix rename to pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix new file mode 100644 index 000000000000..6b49db162277 --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "HUnit"; + version = "1.2.2.3"; # Haskell Platform 2011.2.0.0 + sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz"; + meta = { + description = "A unit testing framework for Haskell"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/1.20.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/HaXml/default.nix rename to pkgs/development/libraries/haskell/HaXml/1.20.2.nix diff --git a/pkgs/development/libraries/haskell/OpenGL/default.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/OpenGL/default.nix rename to pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix 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 46e0fd0dad75..c11b3612a455 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "OpenGL"; - version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 - sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502"; + version = "2.2.3.0"; # Haskell Platform 2010.1.0.0, 2010.2.0.0, 2011.2.0.0 + sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57"; propagatedBuildInputs = [mesa libX11]; meta = { description = "A binding for the OpenGL graphics system"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/default.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/QuickCheck/default.nix rename to pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix new file mode 100644 index 000000000000..e305874bef9e --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "QuickCheck"; + version = "1.2.0.1"; # version of QuickCheck1 compatible with base-4 + sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; + meta = { + description = "Automatic testing of Haskell programs"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix rename to pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix new file mode 100644 index 000000000000..dd00a888fce6 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix @@ -0,0 +1,14 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "QuickCheck"; + version = "2.4.0.1"; # Haskell Platform 2011.2.0.0 + sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Automatic testing of Haskell programs"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index f958ec713a15..67d41c384222 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "SHA"; - version = "1.4.1.1"; - sha256 = "8ecdc91679d1aa1d4050e1124cf5af79ae2ece66aee3b907e1078d71bf03169a"; + version = "1.4.1.3"; + sha256 = "1sx68mvzb2y3dq9hk769fzp8vw4jf4hk5v45i0a9a8b31imlicf0"; propagatedBuildInputs = [binary]; meta = { description = "Implementations of the SHA suite of message digest functions"; diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix index 348832af8fec..530252017fbc 100644 --- a/pkgs/development/libraries/haskell/WebBits/1.0.nix +++ b/pkgs/development/libraries/haskell/WebBits/1.0.nix @@ -1,11 +1,11 @@ -{cabal, mtl, parsec}: +{cabal, mtl, parsec, syb}: cabal.mkDerivation (self : { pname = "WebBits"; version = "1.0"; sha256 = "1xqk4ajywlaq9nb9a02i7c25na5p2qbpc2k9zw93gbapppjiapsc"; - propagatedBuildInputs = [ mtl parsec ]; + propagatedBuildInputs = [ mtl parsec syb ]; meta = { description = "WebBits is a collection of libraries for working with JavaScript."; diff --git a/pkgs/development/libraries/haskell/WebBits/default.nix b/pkgs/development/libraries/haskell/WebBits/default.nix index 8d67f42669e6..34592febd8b1 100644 --- a/pkgs/development/libraries/haskell/WebBits/default.nix +++ b/pkgs/development/libraries/haskell/WebBits/default.nix @@ -1,11 +1,11 @@ -{cabal, mtl, parsec}: +{cabal, mtl, parsec, syb}: cabal.mkDerivation (self : { pname = "WebBits"; version = "2.0"; sha256 = "14a1rqlq925f6rdbi8yx44xszj5pvskcmw1gi1bj8hbilgmlwi7f"; - propagatedBuildInputs = [ mtl parsec ]; + propagatedBuildInputs = [ mtl parsec syb ]; meta = { description = "WebBits is a collection of libraries for working with JavaScript."; diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index 214cc3aecc7d..70956b068705 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,4 +1,4 @@ -{cabal, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}: +{cabal, syb, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}: assert xineramaSupport -> (libXinerama != null && libXext != null); @@ -6,7 +6,7 @@ cabal.mkDerivation (self : { pname = "X11"; version = "1.5.0.0"; sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f"; - propagatedBuildInputs = [libX11] ++ (if xineramaSupport then [libXinerama libXext] else []); + propagatedBuildInputs = [libX11 syb] ++ (if xineramaSupport then [libXinerama libXext] else []); meta = { description = "A Haskell binding to the X11 graphics library"; }; diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index d46b2580918f..df975a877fde 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -3,9 +3,9 @@ {stdenv, fetchurl, lib, ghc, enableLibraryProfiling ? false} : { mkDerivation = - transform : - let dtransform = - self : { + args : # arguments for the individual package, can modify the defaults + let defaults = + self : { # self is the final version of the attribute set # pname should be defined by the client to be the package basename # version should be defined by the client to be the package version @@ -77,7 +77,7 @@ ./Setup build export GHC_PACKAGE_PATH=$(ghc-packages) - [ -n "$noHadock" ] || ./Setup haddock + [ -n "$noHaddock" ] || ./Setup haddock eval "$postBuild" ''; @@ -115,5 +115,5 @@ # in Cabal derivations. inherit stdenv ghc; }; - in stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f); + in stdenv.mkDerivation ((rec { f = defaults f // args f; }).f); } diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 98fc62c05680..69b2ecad422c 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "cairo"; - version = "0.11.1"; - sha256 = "6d7209bcdb92b09437980c51646c324f501edd2893393e48aa185462dfc07b58"; + version = "0.12.0"; + sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9"; extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools]; propagatedBuildInputs = [mtl]; meta = { diff --git a/pkgs/development/libraries/haskell/cgi/default.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/cgi/default.nix rename to pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix new file mode 100644 index 000000000000..6b411ef7eca5 --- /dev/null +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec, xhtml}: + +cabal.mkDerivation (self : { + pname = "cgi"; + version = "3001.1.7.4"; # Haskell Platform 2011.2.0.0 + sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd"; + propagatedBuildInputs = [mtl network parsec xhtml]; + meta = { + description = "A library for writing CGI programs"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix new file mode 100644 index 000000000000..1b41e6f33273 --- /dev/null +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -0,0 +1,13 @@ +{cabal, json, mtl, pandocTypes, parsec, syb, utf8String, xml}: + +cabal.mkDerivation (self : { + pname = "citeproc-hs"; + version = "0.3.2"; + sha256 = "04lq0w1yjasn4i9siqpw41ia9f67xlv7vqwhs2a87hr1jnr09pgf"; + propagatedBuildInputs = + [json mtl pandocTypes parsec syb utf8String xml]; + meta = { + description = "A Citation Style Language implementation in Haskell"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix index 45ec971ce8ac..de7d4bbffe70 100644 --- a/pkgs/development/libraries/haskell/datetime/default.nix +++ b/pkgs/development/libraries/haskell/datetime/default.nix @@ -3,7 +3,7 @@ cabal.mkDerivation (self : { pname = "datetime"; version = "0.1"; - sha256 = "931acc70cb45922c95f2c3225d04619e19fd9c5947a66ae69e96d6e693195048"; + sha256 = "0j2h369ydmlnkvk6m9j7b6fgs6cyc425s8n3yaajr4j5rdqcq6lk"; propagatedBuildInputs = [QuickCheck time]; meta = { description = "Utilities to make Data.Time.* easier to use"; diff --git a/pkgs/development/libraries/haskell/deepseq/default.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/deepseq/default.nix rename to pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix new file mode 100644 index 000000000000..719ba91483ac --- /dev/null +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "deepseq"; + version = "1.1.0.2"; # Haskell Platform 2011.2.0.0 + sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135"; + meta = { + description = "Provides a deep version of seq, for fully evaluating data structures"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index c2423be8e53c..ce9a4edc0271 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "digest"; - version = "0.0.0.5"; - sha256 = "dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd"; + version = "0.0.0.9"; + sha256 = "15gj3iq3jm4lnkc6hnj9v8p8ia3yzbsajwf9by3b1kpl449k2h29"; propagatedBuildInputs = [zlib]; meta = { description = "Various cryptographic hashes for bytestrings: CRC32 and Adler32 for now"; diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix new file mode 100644 index 000000000000..6f99da03c801 --- /dev/null +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -0,0 +1,14 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "dlist"; + version = "0.5"; + sha256 = "1shr5wlpha68h82gwpndr5441847l01gh3j7szyvnmgzkr0fb027"; + propagatedBuildInputs = []; + meta = { + description = "Differences lists"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index 7ba92613c5e2..3f1e9173efaa 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "feed"; - version = "0.3.7"; - sha256 = "c2d539f763cdce1b1498f1fd0707b12078337aff690f01e41db0b6e3569c08aa"; + version = "0.3.8"; + sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576"; propagatedBuildInputs = [utf8String xml]; meta = { description = "Interfacing with RSS and Atom feeds"; diff --git a/pkgs/development/libraries/haskell/fgl/default.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/fgl/default.nix rename to pkgs/development/libraries/haskell/fgl/5.4.2.2.nix 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 0c326683a4f0..01d0f6a64f26 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "fgl"; - version = "5.4.2.3"; # Haskell Platform 2010.2.0.0 - sha256 = "e72142b555a5ab6c5cdced317b42e8cafdbb54b7e2e46ed14e6ca18d71d486b8"; + version = "5.4.2.3"; # Haskell Platform 2010.2.0.0 and 2011.2.0.0 + sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7"; propagatedBuildInputs = [mtl]; meta = { description = "Martin Erwig's Functional Graph Library"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 2d3fc9268575..996d0a51cbd3 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "filestore"; - version = "0.3.4.1"; - sha256 = "ad04333fae938ae7de747457a6bdee30c6e4b700733265dbd1f4f8ee363c8230"; + version = "0.4.0.3"; + sha256 = "098z9niavzxfzwk40xabah3x06vdzprvsjkyx99wlmapi5rynfz3"; propagatedBuildInputs = [datetime parsec regexPosix split time utf8String xml Diff]; meta = { description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index b9d3ee4d13e8..bb4ba31741d0 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self : { version = "0.2.0.1"; sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6"; propagatedBuildInputs = [binary mtl]; + preConfigure = '' + sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal + ''; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 4859a2ca0ee1..6edfa44087e2 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -2,20 +2,20 @@ SHA, cgi, datetime, filestore, highlightingKate, safe, mtl, network, pandoc, parsec, recaptcha, utf8String, xhtml, zlib, ConfigFile, url, - cautiousFile, feed}: + cautiousFile, feed, xssSanitize}: cabal.mkDerivation (self : { pname = "gitit"; - version = "0.7.3.8"; - sha256 = "356c82604dcfe2eec4faeb36ee46546ea3e26738780723f457366b2e35f6211a"; + version = "0.7.3.12"; + sha256 = "1z5cbkgfvwc9h6jciw7ghlj9ra6xph5z4lmliwkdnf38wfparxja"; propagatedBuildInputs = [ HStringTemplate happstackServer happstackUtil HTTP SHA cgi datetime filestore highlightingKate safe mtl network pandoc parsec recaptcha utf8String xhtml zlib ConfigFile - url cautiousFile feed + url cautiousFile feed xssSanitize ]; meta = { - description = "Wiki using HAppS, git or darcs, and pandoc"; + description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; maintainers = [self.stdenv.lib.maintainers.andres]; }; diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index f3152a924830..3f1a0529a83d 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "glade"; - version = "0.11.1"; - sha256 = "0d96a8576f89a81aa1ecdaf172e42e9eb1e7b40ce1b23cff36ab473165832c6a"; + version = "0.12.0"; + sha256 = "0h7l1kp9y17xqyz16kv0dvwgblph9r70wimyl8aq9gi1r4is5lmq"; extraBuildInputs = [pkgconfig gtk2hsBuildtools gnome.libglade gnome.gtk glibc]; propagatedBuildInputs = [cairo glib gtk mtl pango]; meta = { diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index d56a9abe5958..78fc7d37d0ef 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "glib"; - version = "0.11.2"; - sha256 = "e0fb5f3c22701807db364dff86d55f2a33a57d8a4e58d37a80d367bca50b3dbb"; + version = "0.12.0"; + sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19"; extraBuildInputs = [pkgconfig glib glibc gtk2hsBuildtools]; meta = { 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 5e940e4e8c5a..b9c4400bee40 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "gtk"; - version = "0.11.2"; - sha256 = "c9de86278780badbd874fb75ef01ca12a70364a9985b75f98957ba940df27aa6"; + version = "0.12.0"; + sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2"; extraBuildInputs = [pkgconfig gtk2hsBuildtools gtk glibc]; propagatedBuildInputs = [cairo glib mtl pango]; meta = { diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 07fa2fbf9a97..1b7a092cec67 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "gtk2hs-buildtools"; - version = "0.11.2"; - sha256 = "330c52830358966bcff308f58a570e84bb0b4d6004b6f01107d55dd88faa54ad"; + version = "0.12.0"; + sha256 = "1czlmyr9zhzc0h1j0z3chv06ma77cibq2yc6h1slfphb1lkv66a8"; extraBuildInputs = [alex happy]; meta = { description = "Tools to build the Gtk2Hs suite of User Interface libraries"; diff --git a/pkgs/development/libraries/haskell/gtk2hs/default.nix b/pkgs/development/libraries/haskell/gtk2hs/default.nix deleted file mode 100644 index b58e3e928d7f..000000000000 --- a/pkgs/development/libraries/haskell/gtk2hs/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome, cairo, ghc, mtl }: - -stdenv.mkDerivation rec { - pname = "gtk2hs"; - version = "0.10.0"; - fname = "${pname}-${version}"; - name = "haskell-${pname}-ghc${ghc.ghc.version}-${version}"; - - src = fetchurl { - url = http://nixos.org/tarballs/gtk2hs-0.10.0-20090419.tar.gz; - sha256 = "18a7cfph83yvv91ks37nrgqrn21fvww8bhb8nd8xy1mgb8lnfds1"; - }; - - propagatedBuildInputs = [mtl]; - - buildInputs = [ - pkgconfig cairo ghc gnome.glib gnome.gtk gnome.libglade - gnome.GConf gnome.gtksourceview gnome.librsvg - ]; - - preConfigure = - '' - sed -i gio/gio.package.conf.in -e 's|@GIO_LIBDIR_CQ@|"${gnome.glib}/lib", "${gnome.glib}/lib64", @GIO_LIBDIR_CQ@|' - sed -i gtk/gtk.package.conf.in -e 's|@GTK_LIBDIR_CQ@|"${gnome.glib}/lib", "${gnome.glib}/lib64", @GTK_LIBDIR_CQ@|' - ''; - - configureFlags = ["--without-pkgreg"]; - - postInstall = - '' - local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version} - local installedPkgConf=$confDir/${fname}.installedconf - ensureDir $out/bin # necessary to get it added to PATH - ensureDir $confDir - echo $installedPkgConf - echo '[]' > $installedPkgConf - for pkgConf in $out/lib/gtk2hs/*.conf; do - cp $pkgConf $confDir/ - GHC_PACKAGE_PATH=$installedPkgConf ghc-pkg --global register $pkgConf --force - done - ''; # */ - - passthru = { inherit (gnome) gtksourceview; }; -} diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index f6019c54c9f7..f3ae246124e0 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "gtksourceview2"; - version = "0.11.1"; - sha256 = "1skb13ssp6sd06jb3nshv97wjqvwa0mnzcxgmrxwd5l21r6k1m2v"; + version = "0.12.2"; + sha256 = "0l9y48kmzqzps6k54fgf0dkmmv0ppxx8amggfdswwk86zsf8j81r"; extraBuildInputs = [pkgconfig gtksourceview gtkC glibc gtk2hsBuildtools]; propagatedBuildInputs = [glib gtk]; meta = { diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix index de54b3ccac3e..7ba7f354c6ce 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -1,12 +1,12 @@ -{cabal, mtl, sybWithClass, sybWithClassInstancesText, HaXml, +{cabal, mtl, syb, sybWithClass, sybWithClassInstancesText, HaXml, happstackUtil, binary, text}: cabal.mkDerivation (self : { pname = "happstack-data"; - version = "0.5.0.2"; - sha256 = "03795c24acc2268f39d38f18dd6cbfb92893f7de88b0443219d582a1eabdacd5"; + version = "0.5.0.3"; + sha256 = "0zjsb9n1iawg2jv6i5q52awifly7yi6w0ilndivwp168qvi25awn"; propagatedBuildInputs = [ - mtl sybWithClass sybWithClassInstancesText HaXml + mtl syb sybWithClass sybWithClassInstancesText HaXml happstackUtil binary text ]; meta = { diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 461137c933dc..377e725dd59f 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "happstack-server"; - version = "0.5.0.2"; - sha256 = "0184c835958bf9f29009a5aedd2c913bb1ad6ab60b80d9750849381c172dd6b6"; + version = "0.5.0.4"; + sha256 = "1iyjrlg5x6rlx8bfhn62a0ckjap0zv22hb6yazqph53jx6vn9b7q"; propagatedBuildInputs = [ HUnit HaXml MaybeT happstackData happstackUtil hslogger html mtl network parsec sendfile utf8String xhtml zlib diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index cab41882514d..4bbe269fc729 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self : { pname = "happstack-util"; - version = "0.5.0.2"; - sha256 = "b6a84a55d6f7aec51095121a240bd6096b0df3c61c6fd25963d91190fcca4657"; + version = "0.5.0.3"; + sha256 = "1ipr09d0s1d0dffc1g3js8infhybw9rimabrl96a2vw7app3ys44"; propagatedBuildInputs = [ mtl hslogger HUnit QuickCheck strictConcurrency unixCompat SMTPClient diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index 0a0409b6bf9c..94b38fe0fb1c 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "hashed-storage"; - version = "0.5.3"; - sha256 = "0ql8hgsaazs0wxvr920vm2s2iljcnh6lnivcy3vgd5wjaw6lkd00"; + version = "0.5.5"; + sha256 = "03wx21kgnvkny8b6fz86wg85pr2sxbm15ndznnpqjg5gf126n842"; propagatedBuildInputs = [mtl zlib mmap binary dataenc]; meta = { description = "Hashed file storage support code"; diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 646400acc5a7..8c1ca9d87d20 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "haskeline"; - version = "0.6.2.2"; - sha256 = "b6307563258802453d65c7e7bd1ef1c6635fefea17af3e01449192b52075b25b"; + version = "0.6.3.2"; + sha256 = "0ragimzrilsk5r8n0fbq3lyjww28bmc1r1vgjf9pb4kpfpbz0cq8"; propagatedBuildInputs = [extensibleExceptions mtl utf8String]; meta = { description = "A command-line interface for user input, written in Haskell"; diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix index 87b5173620c8..20aec7e59e98 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix @@ -1,6 +1,7 @@ {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline, haskellSrc, html, parallel, regexBase, regexCompat, regexPosix, - stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}: + stm, time, xhtml, zlib, parsec, network, + cabalInstall, alex, happy, haddock, ghc}: cabal.mkDerivation (self : { pname = "haskell-platform"; @@ -12,7 +13,8 @@ cabal.mkDerivation (self : { propagatedBuildInputs = [ GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline haskellSrc html parallel regexBase regexCompat regexPosix - stm time xhtml zlib cabalInstall alex happy ghc + stm time xhtml zlib parsec network + cabalInstall alex happy ghc ]; meta = { description = "Haskell Platform meta package"; diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix index 73b076947d28..117c4fb3bf90 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix @@ -1,6 +1,7 @@ {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}: + stm, xhtml, zlib, parsec, + cabalInstall, alex, happy, haddock, ghc}: cabal.mkDerivation (self : { pname = "haskell-platform"; @@ -12,7 +13,8 @@ cabal.mkDerivation (self : { propagatedBuildInputs = [ GLUT HTTP HUnit OpenGL QuickCheck cgi fgl haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib cabalInstall alex happy ghc haddock + stm xhtml zlib parsec + cabalInstall alex happy ghc haddock ]; meta = { description = "Haskell Platform meta package"; diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix index 5e39d3ddffb3..476fc35f7042 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix @@ -1,6 +1,7 @@ {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}: + stm, xhtml, zlib, mtl, parsec, deepseq, + cabalInstall, alex, happy, haddock, ghc}: cabal.mkDerivation (self : { pname = "haskell-platform"; @@ -12,7 +13,8 @@ cabal.mkDerivation (self : { propagatedBuildInputs = [ GLUT HTTP HUnit OpenGL QuickCheck cgi fgl haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib cabalInstall alex happy ghc haddock + stm xhtml zlib mtl parsec deepseq + cabalInstall alex happy ghc haddock ]; meta = { description = "Haskell Platform meta package"; diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix new file mode 100644 index 000000000000..1b4e56f68d0f --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix @@ -0,0 +1,26 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, + stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, + cabalInstall, alex, happy, haddock, ghc}: + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2011.2.0.0"; + src = fetchurl { + # url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; + url = "http://lambda.haskell.org/hp-tmp/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; + sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb"; + }; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel parsec regexBase regexCompat regexPosix + stm syb deepseq text transformers mtl xhtml zlib + cabalInstall alex happy ghc haddock + ]; + noHaddock = true; + meta = { + description = "Haskell Platform meta package"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix index 6b4d48c67154..f6be0149b990 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "haskell-src-exts"; - version = "1.9.0"; - sha256 = "dedb529217dfe393f75f26b735f7dd09eea50006481f60d06e169de6f328d1da"; + version = "1.9.6"; + sha256 = "1bdbjwhzms962ncwiszp82a8m6jkgz6d9cns5585kipy9n224d3h"; extraBuildInputs = [happy]; propagatedBuildInputs = [cpphs]; meta = { diff --git a/pkgs/development/libraries/haskell/haskell-src/default.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskell-src/default.nix rename to pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix 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 new file mode 100644 index 000000000000..7855b4a92c83 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix @@ -0,0 +1,13 @@ +{cabal, happy, syb}: + +cabal.mkDerivation (self : { + pname = "haskell-src"; + version = "1.0.1.4"; # Haskell Platform 2011.2.0.0 + sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j"; + extraBuildInputs = [happy]; + propagatedBuildInputs = [syb]; + meta = { + description = "Manipulating Haskell source code"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 48de03486092..f637caa086c6 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "highlighting-kate"; - version = "0.2.7.1"; - sha256 = "330c5fdc6b5dae62c12ee2455892319df12723346aa75401aea05ea0b24cf5ed"; + version = "0.2.9"; + sha256 = "0mk8m01mqw6vnjldr5idc6611475j4m292cm18kn3wa83000mbgk"; propagatedBuildInputs = [parsec pcreLight xhtml]; meta = { description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix index f1593a6e7f6e..30d1956268e4 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/libraries/haskell/hscolour/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "hscolour"; - version = "1.17"; - sha256 = "b645cdde1b7827dae1519a4423031b4c6bed82a8edb52aa295bea86478ce24b0"; + version = "1.17"; # Haskell Platform 2011.2.0.0 + sha256 = "1c14rrw69a5yjni2mdgdm21fsssc3c1j6i4sa7hxl9vq3ggcsidn"; meta = { description = "Colourise Haskell code"; }; diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix similarity index 70% rename from pkgs/development/libraries/haskell/html/default.nix rename to pkgs/development/libraries/haskell/html/1.0.1.2.nix index 3540d397778f..29168e7187da 100644 --- a/pkgs/development/libraries/haskell/html/default.nix +++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "html"; - version = "1.0.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 + version = "1.0.1.2"; # Haskell Platform 2009.0.0, 2010.1.0.0, 2010.2.0.0, 2011.2.0.0 sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061"; meta = { description = "HTML combinator library"; diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index 08cc6e0ee3d2..8166c890e6fb 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -1,10 +1,13 @@ -{cabal, mtl}: +# syb isn't listed by the HackageDB web interface, but is +# a dependency for Text.JSON.Generic which is only exposed +# if syb is available. +{cabal, mtl, syb}: cabal.mkDerivation (self : { pname = "json"; version = "0.4.4"; sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081"; - propagatedBuildInputs = [mtl]; + propagatedBuildInputs = [mtl syb]; meta = { description = "Support for serialising Haskell to and from JSON"; }; diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/mtl/default.nix rename to pkgs/development/libraries/haskell/mtl/1.1.0.2.nix diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix new file mode 100644 index 000000000000..3598a0d4c3ed --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "mtl"; + version = "1.1.1.1"; # version of mtl1 compatible with ghc7 + sha256 = "157gbrgrg0l9r72nq45dkach53yncysif4qglsaql28g37djc4x6"; + meta = { + description = "Monad transformer library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix new file mode 100644 index 000000000000..f0ad0770220c --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix @@ -0,0 +1,12 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "mtl"; + version = "2.0.1.0"; # Haskell Platform 2011.2.0.0 + sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Monad transformer library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index b9b62c1763b0..d4187a680dae 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,9 @@ cabal.mkDerivation (self : { pname = "multirec"; - version = "0.4"; - sha256 = "ad7a6ae90e1880b3fd79686ce8012e531b738f8f1d10ba836550fc91cfe3695e"; + version = "0.5"; + sha256 = "1nrfbiy5g51cpaqqi1adrr32x74wjjvplyyrphvzf4rxhnhj3xpw"; + noHaddock = true; # don't know why Haddock causes an error meta = { description = "Generic programming with systems of recursive datatypes"; }; diff --git a/pkgs/development/libraries/haskell/network/default.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix similarity index 100% rename from pkgs/development/libraries/haskell/network/default.nix rename to pkgs/development/libraries/haskell/network/2.2.1.4.nix diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix new file mode 100644 index 000000000000..529785169d00 --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix @@ -0,0 +1,12 @@ +{cabal, parsec}: + +cabal.mkDerivation (self : { + pname = "network"; + version = "2.3.0.2"; # Haskell Platform 2011.2.0.0 + sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03"; + propagatedBuildInputs = [parsec]; + meta = { + description = "Networking-related facilities"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix new file mode 100644 index 000000000000..dca729dc50c3 --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -0,0 +1,11 @@ +{cabal, syb}: + +cabal.mkDerivation (self : { + pname = "pandoc-types"; + version = "1.8"; + sha256 = "1ikr1dmmdag31hgcswrnhzqacv4kl7z6dc8za2cjdq0cpd2mla98"; + propagatedBuildInputs = [syb]; + meta = { + 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 7bc1d0fc7fd8..e5865a1356af 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,13 +1,11 @@ -{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml, - texmath, random ? null}: +{cabal, HTTP, citeprocHs, dlist, tagsoup, texmath, xhtml, zipArchive}: cabal.mkDerivation (self : { pname = "pandoc"; - version = "1.6"; - sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b"; - propagatedBuildInputs = [ - mtl network parsec utf8String xhtml zipArchive HTTP xml texmath - ] ++ (if random != null then [random] else []); + version = "1.8.1.1"; + sha256 = "0g680j8x3v19wcb9k2dxgrdrjr48w0vhvlspfzgw0sgzrgfmaqsj"; + propagatedBuildInputs = + [HTTP citeprocHs dlist tagsoup texmath xhtml zipArchive]; meta = { description = "Conversion between markup formats"; }; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 2a8ba497f3f9..97700106b17a 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "pango"; - version = "0.11.2"; - sha256 = "fb7f5dc303d3d49a330aaa3acf29560f78746edb9c67f6191756baa1b08fb504"; + version = "0.12.0"; + sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb"; extraBuildInputs = [pkgconfig gtk2hsBuildtools pango glibc]; propagatedBuildInputs = [cairo glib mtl]; meta = { diff --git a/pkgs/development/libraries/haskell/parallel/default.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/parallel/default.nix rename to pkgs/development/libraries/haskell/parallel/1.1.0.1.nix diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix new file mode 100644 index 000000000000..2c6352e923f8 --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix @@ -0,0 +1,12 @@ +{cabal, deepseq}: + +cabal.mkDerivation (self : { + pname = "parallel"; + version = "3.1.0.1"; # Haskell Platform 2011.2.0.0 + sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns"; + propagatedBuildInputs = [deepseq]; + meta = { + description = "parallel programming library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/parsec/default.nix rename to pkgs/development/libraries/haskell/parsec/2.1.0.1.nix diff --git a/pkgs/development/libraries/haskell/parsec/3.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix similarity index 67% rename from pkgs/development/libraries/haskell/parsec/3.nix rename to pkgs/development/libraries/haskell/parsec/3.1.1.nix index 048dc87b547a..5c5450333985 100644 --- a/pkgs/development/libraries/haskell/parsec/3.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "parsec"; - version = "3.1.0"; - sha256 = "962d39944bae18b0fea60961c77513f455f95c0f67ae4b10ab15484a27b6fb98"; + version = "3.1.1"; # Haskell Platform 2011.2.0.0 + sha256 = "0x34gwn9k68h69c3hw7yaah6zpdwq8hvqss27f3n4n4cp7dh81fk"; propagatedBuildInputs = [mtl]; meta = { license = "BSD"; diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix index 1542bb7968ac..5b6ac6abffd4 100644 --- a/pkgs/development/libraries/haskell/pcre-light/default.nix +++ b/pkgs/development/libraries/haskell/pcre-light/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "pcre-light"; - version = "0.3"; - sha256 = "a8cfec1c265530388efbb187426368e280331d9829fa93d8f49f16db3c3e7794"; + version = "0.4"; + sha256 = "1xiikiap1bvx9czw64664vifdq64scx0yhfclh5m8mkvn3x6yzxk"; propagatedBuildInputs = [pcre]; meta = { description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions"; diff --git a/pkgs/development/libraries/haskell/regex-base/default.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-base/default.nix rename to pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix 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 3f9d23e95333..b1db30548bac 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "regex-base"; - version = "0.93.2"; # Haskell Platform 2010.2.0.0 - sha256 = "20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278"; + version = "0.93.2"; # Haskell Platform 2010.2.0.0, 2011.2.0.0 + sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10"; propagatedBuildInputs = [mtl]; meta = { description = "Replaces/Ehances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/default.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-compat/default.nix rename to pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix 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 749e6baaf736..1113b38cbb0a 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "regex-compat"; - version = "0.93.1"; # Haskell Platform 2010.2.0.0 - sha256 = "ee0374f780378e8c04a63d9cbaca525e116dbe2bdce4cff3abaffc28d4e99afe"; + version = "0.93.1"; # Haskell Platform 2010.2.0.0, 2011.2.0.0 + sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf"; propagatedBuildInputs = [regexBase regexPosix]; meta = { description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/default.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-posix/default.nix rename to pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix new file mode 100644 index 000000000000..3ac8782f0df0 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix @@ -0,0 +1,12 @@ +{cabal, regexBase}: + +cabal.mkDerivation (self : { + pname = "regex-posix"; + version = "0.94.4"; # Haskell Platform 2011.2.0.0 + sha256 = "1ykirysvz9ganm2k7fmrppklsgh0h35mjfsi9g1icv43pqpr6ldw"; + propagatedBuildInputs = [regexBase]; + meta = { + description = "Replaces/Enhances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index 0c41af7e1d3f..cce391c8153d 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "safe"; - version = "0.2"; - sha256 = "73b9a247c3ba8092236c8c912687399778ff31bf3df42d707563a1528a6fc0e0"; + version = "0.3"; + sha256 = "174jm7nlqsgvc6namjpfknlix6yy2sf9pxnb3ifznjvx18kgc7m0"; meta = { description = "Library for safe (pattern match free) functions"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index a006cbe072eb..131fa06fd7b4 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "split"; - version = "0.1.1"; - sha256 = "5f6513e717abfaa8eab46d7181093a21d335fed33dff20fa4628008b770a763f"; + version = "0.1.3"; + sha256 = "1i43xa11d5jn30j9948bypi8dzdxr7nx4v9xhcgpmaggssv9bvcs"; meta = { description = "Combinator library for splitting lists"; }; diff --git a/pkgs/development/libraries/haskell/stm/default.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/stm/default.nix rename to pkgs/development/libraries/haskell/stm/2.1.1.2.nix diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix new file mode 100644 index 000000000000..5a80ec5f47d8 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "stm"; + version = "2.2.0.1"; # Haskell Platform 2011.2.0.0 + sha256 = "1p0x414ffsd77mmlfz1cmwg2cbhinnbpxypxgvygg05js67msj8q"; + meta = { + description = "Software Transactional Memory"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix new file mode 100644 index 000000000000..fb756ec30f0a --- /dev/null +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -0,0 +1,14 @@ +{cabal, gtk2hsBuildtools, cairo, glib, mtl, pkgconfig, librsvg, glibc}: + +cabal.mkDerivation (self : { + pname = "svgcairo"; + version = "0.12.0"; + sha256 = "1zialw59njmq0sfz9f0rx6v50d4bvld2ivmwljkp5bmxii3hcjl3"; + extraBuildInputs = [pkgconfig librsvg glibc gtk2hsBuildtools]; + propagatedBuildInputs = [cairo glib mtl]; + meta = { + description = "Binding to the Cairo library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix new file mode 100644 index 000000000000..613badbb5f32 --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.2.2.nix @@ -0,0 +1,10 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "syb"; + version = "0.2.2"; + sha256 = "0m29vnqkkmpf4m3gi42kcbr2gfyxgkcw85xsyrq0mgbxb0zg6ky9"; + meta = { + description = "generics system described in the Scrap Your Boilerplate papers"; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix new file mode 100644 index 000000000000..0fdf7cce0a69 --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.3.nix @@ -0,0 +1,10 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "syb"; + version = "0.3"; # Haskell Platform 2011.2.0.0 + sha256 = "1gnqw76zy7xvlabhbyk8hml88hpz2igf7b3mz2ic091f77qkkch7"; + meta = { + description = "generics system described in the Scrap Your Boilerplate papers"; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index dfd7d1946351..42e83c679761 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "syb-with-class"; - version = "0.6.1"; - sha256 = "72cf0a98862181fea81b77c11f35efd22eafa29107f3acd624fd08be68ed850b"; + version = "0.6.1.1"; + sha256 = "15i6df470c2qcf9vc05yg809c5imrj00mf72p5njapx88qnk2p67"; meta = { description = "Scrap Your Boilerplate With Class"; }; diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix new file mode 100644 index 000000000000..51b14a540535 --- /dev/null +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "tagsoup"; + version = "0.12"; + sha256 = "0jaqr6q8asn7gd336xsblcc55lzm8glzlhvs61mhzjvk4hg9pmg7"; + meta = { + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 623f86ee3fd3..0dd4fe50f5c4 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -1,10 +1,10 @@ -{cabal, cgi, json, parsec, xml}: +{cabal, parsec, syb, xml}: cabal.mkDerivation (self : { pname = "texmath"; - version = "0.3.0.2"; - sha256 = "8d2bb26fc5aab09ae92d2c194ec39acb4e04c054ad2caf1a1db0dc9b53b4b1d4"; - propagatedBuildInputs = [cgi json parsec xml]; + version = "0.5.0.1"; + sha256 = "0kw23b1df7456d2h48g2p7k8nvfv80a8a70xgkq4pn7v50vqipdy"; + propagatedBuildInputs = [parsec syb xml]; meta = { description = "Conversion of LaTeX math formulas to MathML"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/text/default.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix similarity index 68% rename from pkgs/development/libraries/haskell/text/default.nix rename to pkgs/development/libraries/haskell/text/0.11.0.5.nix index c146af8bb620..af31029bdd9b 100644 --- a/pkgs/development/libraries/haskell/text/default.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "text"; - version = "0.7.2.1"; - sha256 = "13b00db1363219e263a4af5b1318d2a296d67c975883cd7e17265fcd8fb1381c"; + version = "0.11.0.5"; # Haskell Platform 2011.2.0.0 + sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; propagatedBuildInputs = [deepseq]; meta = { description = "An efficient package Unicode text type"; diff --git a/pkgs/development/libraries/haskell/time/default.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix similarity index 100% rename from pkgs/development/libraries/haskell/time/default.nix rename to pkgs/development/libraries/haskell/time/1.1.2.4.nix diff --git a/pkgs/development/libraries/haskell/transformers/default.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix similarity index 55% rename from pkgs/development/libraries/haskell/transformers/default.nix rename to pkgs/development/libraries/haskell/transformers/0.2.2.0.nix index ef2c7ed74a75..d3a60d4cf690 100644 --- a/pkgs/development/libraries/haskell/transformers/default.nix +++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "transformers"; - version = "0.2.1.0"; - sha256 = "1ff9768e60130810e888452b6052d64998d0651fe2835902f032d8f8182a2c6d"; + version = "0.2.2.0"; # Haskell Platform 2011.2.0.0 + sha256 = "1nkazxy2p0w5ad76vg1lc4l0nla1kdqjdf9pymjgk75dpiyijbdz"; meta = { description = "Concrete functor and monad transformers"; }; diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index fe887014ef15..06451b53e248 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -1,10 +1,10 @@ -{cabal, mtl}: +{cabal, mtl, syb}: cabal.mkDerivation (self : { pname = "uniplate"; - version = "1.5.1"; - sha256 = "cfeaaaabbbe318992df0c51a0c04729b22dac244f415b80a3b388708ed9cfc33"; - propagatedBuildInputs = [mtl]; + version = "1.6"; + sha256 = "13nlyzsnj6hshgl839ww1kp49r87kpdcdyn7hxahg8k2qkj5zzxr"; + propagatedBuildInputs = [mtl syb]; meta = { description = "Uniform type generic traversals"; }; diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 9b29afb15579..98399dd11ccb 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "uulib"; - version = "0.9.12"; - sha256 = "e2ea76db10e5ce94cf6282642754d0e65e5abadc620b3827aa2ab497b88e6747"; + version = "0.9.13"; + sha256 = "115fxvx5lqyjdwws6gkcixk1gi2p5gkyqinww7gbp54p4n0yy7n0"; meta = { description = "Haskell Utecht Tools Library"; }; diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix index cd30b77d5b7b..16d10b49ac21 100644 --- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix @@ -1,10 +1,11 @@ -{cabal, vacuum, gtk2hs, parallel, strictConcurrency}: +{cabal, vacuum, cairo, svgcairo, gtk, parallel, strictConcurrency}: cabal.mkDerivation (self : { pname = "vacuum-cairo"; - version = "0.4.1"; - sha256 = "4d506fec246d40e5c983eea1dbd72735e276f882539aa3682cda9d9a33f8ddb2"; - propagatedBuildInputs = [vacuum gtk2hs parallel strictConcurrency]; + version = "0.5"; + sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc"; + propagatedBuildInputs = + [vacuum cairo svgcairo gtk parallel strictConcurrency]; meta = { description = "Visualize live Haskell data structures using vacuum, graphviz and cairo"; }; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 46f39d1e0a69..c0d536482211 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "vty"; - version = "4.4.0.0"; - sha256 = "bf032022a72831e263d2d48d0a7a3191fb1174554cd714902a60cb0f39afe312"; + version = "4.6.0.4"; + sha256 = "0kabssw3v7nglvsr687ppmdnnmii1q2g5zg8rxwi2hcmvnjx7567"; propagatedBuildInputs = [utf8String terminfo deepseq mtl parallel parsec vectorSpace]; meta = { diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 9d80de70a6b2..33a940eca315 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "wx"; - version = "0.11.1.2"; - sha256 = "d407e191391ec977552932ffbfc86ce7826b56208bbcbc1262d3fc65fe1c2337"; + version = "0.12.1.6"; + sha256 = "1p0gn46gk1abin095va22n9bycxhm2cq1vyvwiypcdq7jq541lhk"; propagatedBuildInputs = [stm wxcore]; meta = { description = "wxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index ecca8a152de7..d46a6ac864d1 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,15 +1,20 @@ -{cabal, time, parsec, stm, libX11, mesa, wxGTK}: +{cabal, time, parsec, stm, wxdirect, libX11, mesa, wxGTK}: cabal.mkDerivation (self : { pname = "wxcore"; - version = "0.11.1.2"; - sha256 = "b91b17243d8a08d96f572224c434c36d14feb1b0bb64a0e63900f0103a7c4752"; - propagatedBuildInputs = [time parsec stm libX11 wxGTK mesa]; + version = "0.12.1.6"; + sha256 = "162m7z8nzdwsszha87mvz7dzxh268n0sgymf3vq2yn5axw7zx5ap"; + propagatedBuildInputs = [time parsec stm libX11 wxGTK mesa wxdirect]; + preConfigure = '' + sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal + ''; /* configureFlags = [ "--with-opengl" ]; */ + /* preConfigure = '' sed -i 's/ghc-pkg latest/ghc-pkg --global latest/g' configure sed -i 's/pkg describe/pkg --global describe/g' configure ''; + */ meta = { description = "wxHaskell core"; }; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix new file mode 100644 index 000000000000..181db89a9847 --- /dev/null +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -0,0 +1,16 @@ +{cabal, parsec, time}: + +cabal.mkDerivation (self : { + pname = "wxdirect"; + version = "0.12.1.3"; + sha256 = "da59315339dc78b3bfbe08c1681d53c74a56e7c3de0f41a90099bd289b1bfb11"; + preConfigure = '' + sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal + sed -i 's|\(time.*\) && < 1.2|\1|' ${self.pname}.cabal + ''; + propagatedBuildInputs = [parsec time]; + meta = { + 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 new file mode 100644 index 000000000000..e4b12f9363de --- /dev/null +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "xhtml"; + version = "3000.2.0.1"; # Haskell Platform 2009.0.0, 2010.1.0.0, 2010.2.0.0, 2011.2.0.0 + sha256 = "15pcigascajky67v0lhdhn4bv8xq16cvzib05mg4f1ynwr5a9mv0"; + meta = { + description = "An XHTML combinator library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix deleted file mode 100644 index 78dc8486a813..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{cabal}: - -cabal.mkDerivation (self : { - pname = "xhtml"; - version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 - sha256 = "60d7a44ae6d607475e2d60c5bf9909b8a3bd88850d52b08ff1532aa6d58bec96"; - meta = { - description = "An XHTML combinator library"; - }; -}) - diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix new file mode 100644 index 000000000000..9a445adeb2a7 --- /dev/null +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -0,0 +1,14 @@ +{cabal, network, tagsoup, utf8String}: + +cabal.mkDerivation (self : { + pname = "xss-sanitize"; + version = "0.2.6"; + sha256 = "18bkvrrkc0ga0610f8g3vghq0ib1yczn2n2zbzv7kg7m6bqgx2y5"; + propagatedBuildInputs = [network tagsoup utf8String]; + meta = { + description = "sanitize untrusted HTML to prevent XSS attacks"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 23fb5045cd4e..ac7ea77754bf 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "zip-archive"; - version = "0.1.1.6"; - sha256 = "16aafc5f74c880398413a7c2adaaf90cae86006dcda58f663c1e1d795add90aa"; + version = "0.1.1.7"; + sha256 = "1q52v18kl1j049kk3yb7rp0k27p6q7r72mg1vcbdid6qd7a9dh48"; propagatedBuildInputs = [binary mtl utf8String zlib digest]; meta = { description = "Library for creating and modifying zip archives"; diff --git a/pkgs/development/libraries/haskell/zlib/default.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/zlib/default.nix rename to pkgs/development/libraries/haskell/zlib/0.5.0.0.nix diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix new file mode 100644 index 000000000000..3d3b2184da8a --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix @@ -0,0 +1,13 @@ +{cabal, zlib}: + +cabal.mkDerivation (self : { + pname = "zlib"; + version = "0.5.3.1"; # Haskell Platform 2011.2.0.0 + sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq"; + # TODO: find out exactly why propagated is needed here (to build other + # packages depending on zlib): + propagatedBuildInputs = [zlib]; + meta = { + description = "Compression and decompression in the gzip and zlib formats"; + }; +}) diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix similarity index 100% rename from pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix rename to pkgs/development/tools/documentation/haddock/2.4.2.nix diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix similarity index 100% rename from pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix rename to pkgs/development/tools/documentation/haddock/2.7.2.nix diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix new file mode 100644 index 000000000000..42dbd81d9ff6 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix @@ -0,0 +1,18 @@ +{cabal, ghcPaths, xhtml, alex, happy, makeWrapper}: + +cabal.mkDerivation (self : { + pname = "haddock"; + version = "2.9.2"; # Haskell Platform 2011.2.0.0 + name = self.fname; + sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; + extraBuildInputs = [alex happy makeWrapper]; + propagatedBuildInputs = [ghcPaths xhtml]; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + + meta = { + description = "a tool for automatically generating documentation from annotated Haskell source code"; + }; +}) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 4f8812c5b96e..75b38f62999e 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,11 +1,12 @@ -{cabal, haskellSrcExts, mtl, uniplate, hscolour, parallel}: +{cabal, haskellSrcExts, mtl, uniplate, hscolour, parallel, transformers}: cabal.mkDerivation (self : { pname = "hlint"; - version = "1.7.3"; + version = "1.8.7"; name = self.fname; - sha256 = "afd4aa623fedf5257464bf18f38376a951d130f3004664803763e67cc55d9e83"; - extraBuildInputs = [haskellSrcExts mtl uniplate hscolour parallel]; + sha256 = "0k2fwwwmq0qqb5nw5acsjr2gqnsmqcf3ckb6wdrkqsqp8g2k14mn"; + extraBuildInputs = + [haskellSrcExts mtl uniplate hscolour parallel transformers]; meta = { description = "Source code suggestions"; }; diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index 00f660b66384..60a3fd400fec 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "hslogger"; - version = "1.0.7"; - sha256 = "0fb8aagylrr5z19801szj868apcns8lafc4ydx9v0ka2lbmjqvbz"; + version = "1.1.4"; + sha256 = "0858jbkjda7ccjzxjnlp2ng1jyvfsa1jhd45vr9bbhsr8qwrdky7"; propagatedBuildInputs = [ mtl time network ]; meta = { description = "Versatile logging framework"; diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 1d1d5ed25a9d..63d48ef9cca1 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -5,6 +5,10 @@ cabal.mkDerivation (self : { version = "0.1.2"; sha256 = "ce1116016f6b2d38e6063ba3dd147f38147a9c4399160f37aba9c50c96d00a90"; propagatedBuildInputs = [binary cairo ghcEvents glade gtk mtl]; + preConfigure = '' + sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal + ''; + configureFlags = "--ghc-options=-rtsopts"; meta = { description = "A graphical thread profiler"; license = "BSD"; diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 06000e514e7f..a7ede2ef3798 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,9 +2,9 @@ cabal.mkDerivation (self : { pname = "uuagc"; - version = "0.9.29"; + version = "0.9.36"; name = self.fname; - sha256 = "325d395abcc1f8224400a3cd765dd187e6be64a782251aa33080aab008b8829e"; + sha256 = "02sl19apxwhgj7zq37pl6xkl35pafma2683d7hyzyyn6y5kqma1j"; extraBuildInputs = [uulib]; meta = { description = "Attribute Grammar System of Universiteit Utrecht"; diff --git a/pkgs/development/tools/parsing/alex/default.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix similarity index 100% rename from pkgs/development/tools/parsing/alex/default.nix rename to pkgs/development/tools/parsing/alex/2.3.1.nix diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix new file mode 100644 index 000000000000..9fbbca7f4e9d --- /dev/null +++ b/pkgs/development/tools/parsing/alex/2.3.5.nix @@ -0,0 +1,12 @@ +{cabal, perl}: + +cabal.mkDerivation (self : { + pname = "alex"; + version = "2.3.5"; # Haskell Platform 2011.2.0.0 + name = self.fname; + sha256 = "0lyjiq4lmii2syk6838ln32qvn8c0ljf1ypsggahy748k05x79if"; + extraBuildInputs = [perl]; + meta = { + description = "A lexical analyser generator for Haskell"; + }; +}) diff --git a/pkgs/development/tools/parsing/happy/happy-1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix similarity index 100% rename from pkgs/development/tools/parsing/happy/happy-1.18.4.nix rename to pkgs/development/tools/parsing/happy/1.18.4.nix diff --git a/pkgs/development/tools/parsing/happy/happy-1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix similarity index 100% rename from pkgs/development/tools/parsing/happy/happy-1.18.5.nix rename to pkgs/development/tools/parsing/happy/1.18.5.nix diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix new file mode 100644 index 000000000000..f6e2ee3bf41c --- /dev/null +++ b/pkgs/development/tools/parsing/happy/1.18.6.nix @@ -0,0 +1,13 @@ +{cabal, mtl, perl}: + +cabal.mkDerivation (self : { + pname = "happy"; + version = "1.18.6"; # Haskell Platform 2011.2.0.0 + name = self.fname; + sha256 = "0q6dnwihi1q761qdq0hhi733nh5d53xz6frwmr7slpvrp6v8y344"; + extraBuildInputs = [perl]; + propagatedBuildInputs = [mtl]; + meta = { + description = "Happy is a parser generator for Haskell"; + }; +}) diff --git a/pkgs/development/tools/parsing/happy/happy-1.17.nix b/pkgs/development/tools/parsing/happy/happy-1.17.nix deleted file mode 100644 index b7fa22ccb800..000000000000 --- a/pkgs/development/tools/parsing/happy/happy-1.17.nix +++ /dev/null @@ -1,12 +0,0 @@ -{cabal, perl}: - -cabal.mkDerivation (self : { - - # requires cabal-1.2 (and therefore, in Nix, currently ghc-6.8) - - pname = "happy"; - version = "1.17"; - name = self.fname; - sha256 = "dca4e47d17e5d538335496236b3d2c3cbff644cf7380c987a4714e7784c70a2b"; - extraBuildInputs = [perl]; -}) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index b51538ef3636..51882f1dd881 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,11 +1,15 @@ -{cabal, binary, mtl, zlib, vty}: +{cabal, binary, mtl, zlib, vty, ConfigFile, MissingH, filepath}: cabal.mkDerivation (self : { pname = "LambdaHack"; - version = "0.1.20090606"; + version = "0.1.20110117"; name = self.fname; - sha256 = "9b8d790b0a99231aff2d108b50dd2f2998b09bec3ffedf9f1415557aaeb6039b"; - propagatedBuildInputs = [binary mtl zlib vty]; + sha256 = "186ccl1yq0r84h9azzwj0zyy3kf905i3kjlnziyi52ysqd61qw90"; + propagatedBuildInputs = + [binary mtl zlib vty ConfigFile MissingH filepath]; + preConfigure = '' + sed -i 's|\(filepath.*\) && < 1.2|\1|' ${self.pname}.cabal + ''; meta = { description = "a small roguelike game"; }; diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix index 686aa804cf02..3d00dfe54f4d 100644 --- a/pkgs/tools/misc/myhasktags/default.nix +++ b/pkgs/tools/misc/myhasktags/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, ghcReal} : +{fetchurl, stdenv, ghcPlain} : /* use case: @@ -29,7 +29,7 @@ stdenv.mkDerivation { ensureDir $out/bin ghc --make $src -o $out/bin/hasktags-modified ''; - buildInputs = [ ghcReal ]; + buildInputs = [ ghcPlain ]; meta = { description = "my patched version of hasktags. Should be merged into hasktags?"; diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix new file mode 100644 index 000000000000..8fa67946477a --- /dev/null +++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix @@ -0,0 +1,13 @@ +{cabal, HTTP, network, zlib} : + +cabal.mkDerivation (self : { + pname = "cabal-install"; + name = self.fname; + version = "0.10.2"; # Haskell Platform 2011.2.0.0 + sha256 = "05gmgxdlymp66c87szx1vq6hlraispdh6pm0n85s74yihjwwhmv3"; + extraBuildInputs = [HTTP network zlib]; + + meta = { + description = "The command-line interface for Cabal and Hackage"; + }; +}) diff --git a/pkgs/tools/package-management/cabal-install/default.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix similarity index 100% rename from pkgs/tools/package-management/cabal-install/default.nix rename to pkgs/tools/package-management/cabal-install/0.6.2.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3741bcb5028b..0f48594885d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1903,45 +1903,7 @@ let # packages. # This should point to the current default version. - haskellPackages = haskellPackages_ghc6123; - - # Old versions of ghc that currently don't build because the binary - # is broken. - /* - haskellPackages_ghc642 = callPackage ./haskell-packages.nix { - ghc = import ../development/compilers/ghc/6.4.2.nix { - inherit fetchurl stdenv perl ncurses readline m4 gmp; - ghc = ghc642Binary; }; - }; - - haskellPackages_ghc661 = callPackage ./haskell-packages.nix { - ghc = import ../development/compilers/ghc/6.6.1.nix { - inherit fetchurl stdenv readline perl58 gmp ncurses m4; - ghc = ghc642Binary; - }; - }; - - haskellPackages_ghc682 = callPackage ./haskell-packages.nix { - ghc = import ../development/compilers/ghc/6.8.2.nix { - inherit fetchurl stdenv perl gmp ncurses m4; - readline = readline5; - ghc = ghc642Binary; - }; - }; - - haskellPackages_ghc683 = recurseIntoAttrs (import ./haskell-packages.nix { - inherit pkgs; - ghc = callPackage ../development/compilers/ghc/6.8.3.nix { - ghc = ghc642Binary; - haddock = import ../development/tools/documentation/haddock/boot.nix { - inherit gmp; - cabal = import ../development/libraries/haskell/cabal/cabal.nix { - inherit stdenv fetchurl lib; - ghc = ghc642Binary; }; - }; - }; - }); - */ + haskellPackages = haskellPackages_ghc702; # NOTE: After discussion, we decided to enable recurseIntoAttrs for all # currently available ghc versions. (Before, it used to be enabled only @@ -1950,46 +1912,35 @@ let # reducing the number or "enabled" versions again. # Helper functions to abstract away from repetitive instantiations. - haskellPackagesFun = ghcPath : profDefault : modifyPrio : recurseIntoAttrs (import ./haskell-packages.nix { - inherit pkgs newScope modifyPrio; + haskellPackagesFun = ghcPath : prefFun : profDefault : modifyPrio : recurseIntoAttrs (import ./haskell-packages.nix { + inherit pkgs newScope modifyPrio prefFun; enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; - ghc = callPackage ghcPath { - ghc = ghc6101Binary; }; + ghc = callPackage ghcPath { ghc = ghc6101Binary; }; }); # Currently active GHC versions. - haskellPackages_ghc6101 = - haskellPackagesFun ../development/compilers/ghc/6.10.1.nix false (x : x); - - haskellPackages_ghc6102 = - haskellPackagesFun ../development/compilers/ghc/6.10.2.nix false (x : x); - - haskellPackages_ghc6103 = - haskellPackagesFun ../development/compilers/ghc/6.10.3.nix false (x : x); - haskellPackages_ghc6104 = - haskellPackagesFun ../development/compilers/ghc/6.10.4.nix false (x : x); + haskellPackagesFun ../development/compilers/ghc/6.10.4.nix (x : x.ghc6104Prefs) false (x : x); haskellPackages_ghc6121 = - haskellPackagesFun ../development/compilers/ghc/6.12.1.nix false (x : x); + haskellPackagesFun ../development/compilers/ghc/6.12.1.nix (x : x.ghc6121Prefs) false (x : x); haskellPackages_ghc6122 = - haskellPackagesFun ../development/compilers/ghc/6.12.2.nix false (x : x); + haskellPackagesFun ../development/compilers/ghc/6.12.2.nix (x : x.ghc6122Prefs) false (x : x); - # Current default version. haskellPackages_ghc6123 = - haskellPackagesFun ../development/compilers/ghc/6.12.3.nix false (x : x); + haskellPackagesFun ../development/compilers/ghc/6.12.3.nix (x : x.ghc6123Prefs) false (x : x); # Will never make it into a platform release, severe bugs; leave at lowPrio. haskellPackages_ghc701 = - haskellPackagesFun ../development/compilers/ghc/7.0.1.nix false lowPrio; + haskellPackagesFun ../development/compilers/ghc/7.0.1.nix (x : x.ghc701Prefs) false lowPrio; - # Will hopefully become new default once Haskell Platform 2011 is released. + # Current default version. haskellPackages_ghc702 = - haskellPackagesFun ../development/compilers/ghc/7.0.2.nix false lowPrio; + haskellPackagesFun ../development/compilers/ghc/7.0.2.nix (x : x.ghc702Prefs) false (x : x); haskellPackages_ghcHEAD = - haskellPackagesFun ../development/compilers/ghc/head.nix false lowPrio; + haskellPackagesFun ../development/compilers/ghc/head.nix (x : x.ghcHEADPrefs) false lowPrio; haxeDist = import ../development/compilers/haxe { inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ccf07c7ae827..a84ec7503ab6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,39 +1,278 @@ -{pkgs, newScope, ghc, enableLibraryProfiling ? false, modifyPrio ? (x : x)}: +# Haskell packages in Nixpkgs +# +# If you have any questions about the packages defined here or how to +# contribute, please contact Andres Loeh. +# +# This file defines all packages that depend on GHC, the Glasgow Haskell +# compiler. They are usually distributed via Hackage, the central Haskell +# package repository. Since at least the libraries are incompatible between +# different compiler versions, the whole file is parameterized by the GHC +# that is being used. GHC itself is defined in all-packages.nix +# +# Note that next to the packages defined here, there is another way to build +# arbitrary packages from HackageDB in Nix, using the hack-nix tool that is +# developed by Marc Weber. +# -> http://github.com/MarcWeber/hack-nix. Read its README file. +# +# +# This file defines a function parameterized by the following: +# +# pkgs: +# the whole Nixpkgs (so that we can depend on non-Haskell packages) +# +# newScope: +# for redefining callPackage locally to resolve dependencies of +# Haskell packages automatically +# +# ghc: +# the GHC version to be used for building the Haskell packages +# +# prefFun: +# version preferences for Haskell packages (see below) +# +# enableLibraryProfiling: +# Boolean flag indicating whether profiling libraries for all Haskell +# packages should be built. If a library is to be built with profiling +# enabled, its dependencies should have profiling enabled as well. +# Therefore, this is implemented as a global flag. +# +# modifyPrio: +# Either the identity function or lowPrio is intended to be passed +# here. The idea is that we can make a complete set of Haskell packages +# have low priority from the outside. +# +# +# Policy for keeping multiple versions: +# +# We keep multiple versions for +# +# * packages that are part of the Haskell Platform +# * packages that are known to have severe interface changes +# +# For the packages where we keep multiple versions, version x.y.z is mapped +# to an attribute of name package_x_y_z and stored in a Nix expression called +# x.y.z.nix. There is no default.nix for such packages. There also is an +# attribute package that is defined to be self.package_x_y_z where x.y.z is +# the default version of the package. The global default can be overridden by +# passing a preferences function. +# +# For most packages, however, we keep only one version, and use default.nix. -let ghcOuter = ghc; in +{pkgs, newScope, ghc, prefFun, enableLibraryProfiling ? false, modifyPrio ? (x : x)}: # We redefine callPackage to take into account the new scope. The optional # modifyPrio argument can be set to lowPrio to make all Haskell packages have # low priority. -let result = let callPackage = x : y : modifyPrio (newScope result x y); in +let result = let callPackage = x : y : modifyPrio (newScope result.final x y); + self = (prefFun result) result; in # Indentation deliberately broken at this point to keep the bulk # of this file at a low indentation level. -rec { +{ - # ==> You're looking for a package but can't find it? Get hack-nix. - # -> http://github.com/MarcWeber/hack-nix. Read its README file. - # You can install (almost) all packages from hackage easily. + final = self; - ghcReal = pkgs.lowPrio ghcOuter; + # Preferences + # + # Different versions of GHC need different versions of certain core packages. + # We start with a suitable platform version per GHC version. + + emptyPrefs = super : super // { }; + ghc6104Prefs = super : super // super.haskellPlatformDefaults_2009_2_0_2 super; + ghc6121Prefs = super : super // super.haskellPlatformDefaults_2010_1_0_0 super; + ghc6122Prefs = super : super // super.haskellPlatformDefaults_2010_2_0_0 super; # link + ghc6123Prefs = super : super // super.haskellPlatformDefaults_2010_2_0_0 super; + ghc701Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link + ghc702Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; + ghcHEADPrefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link + + # GHC and its wrapper + # + # We use a wrapped version of GHC for nearly everything. The wrapped version + # adds functionality to GHC to find libraries depended on or installed via + # Nix. Because the wrapper is so much more useful than the plain GHC, we + # call the plain GHC ghcPlain and the wrapped GHC simply ghc. + + ghcPlain = pkgs.lowPrio ghc; # Note that "ghc" is not "self.ghc" and + # refers to the function argument at the + # top of this file. - # In the remainder, `ghc' refers to the wrapper. This is because - # it's never useful to use the wrapped GHC (`ghcReal'), as the - # wrapper provides essential functionality: the ability to find - # Haskell packages in the buildInputs automatically. ghc = callPackage ../development/compilers/ghc/wrapper.nix { - ghc = ghcOuter; + ghc = ghc; }; + # This is the Cabal builder, the function we use to build most Haskell + # packages. It isn't the Cabal library, which is a core package of GHC + # and therefore not separately listed here. + cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {}; + # Haskell Platform + # + # We try to support several platform versions. For these, we set all + # versions explicitly. + + haskellPlatform = self.haskellPlatform_2011_2_0_0; # global platform default + + haskellPlatformArgs_2011_2_0_0 = self : { + inherit (self) cabal ghc; + cgi = self.cgi_3001_1_7_4; + fgl = self.fgl_5_4_2_3; + GLUT = self.GLUT_2_1_2_1; + haskellSrc = self.haskellSrc_1_0_1_4; + html = self.html_1_0_1_2; + HUnit = self.HUnit_1_2_2_3; + network = self.network_2_3_0_2; + OpenGL = self.OpenGL_2_2_3_0; + parallel = self.parallel_3_1_0_1; + parsec = self.parsec_3_1_1; + QuickCheck = self.QuickCheck_2_4_0_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_93_1; + regexPosix = self.regexPosix_0_94_4; + stm = self.stm_2_2_0_1; + syb = self.syb_0_3; + xhtml = self.xhtml_3000_2_0_1; + zlib = self.zlib_0_5_3_1; + HTTP = self.HTTP_4000_1_1; + deepseq = self.deepseq_1_1_0_2; + text = self.text_0_11_0_5; + transformers = self.transformers_0_2_2_0; + mtl = self.mtl_2_0_1_0; + cabalInstall = self.cabalInstall_0_10_2; + alex = self.alex_2_3_5; + happy = self.happy_1_18_6; + haddock = self.haddock_2_9_2; + }; + + haskellPlatformDefaults_2011_2_0_0 = + self : self.haskellPlatformArgs_2011_2_0_0 self // { + haskellPlatform = self.haskellPlatform_2011_2_0_0; + mtl1 = self.mtl_1_1_1_1; + }; + + haskellPlatform_2011_2_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.0.nix + (self.haskellPlatformArgs_2011_2_0_0 self); + + haskellPlatformArgs_2010_2_0_0 = self : { + inherit (self) cabal ghc; + cgi = self.cgi_3001_1_7_3; + fgl = self.fgl_5_4_2_3; + GLUT = self.GLUT_2_1_2_1; + haskellSrc = self.haskellSrc_1_0_1_3; + html = self.html_1_0_1_2; + HUnit = self.HUnit_1_2_2_1; + mtl = self.mtl_1_1_0_2; + network = self.network_2_2_1_7; + OpenGL = self.OpenGL_2_2_3_0; + parallel = self.parallel_2_2_0_1; + parsec = self.parsec_2_1_0_1; + QuickCheck = self.QuickCheck_2_1_1_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_93_1; + regexPosix = self.regexPosix_0_94_2; + stm = self.stm_2_1_2_1; + xhtml = self.xhtml_3000_2_0_1; + zlib = self.zlib_0_5_2_0; + HTTP = self.HTTP_4000_0_9; + deepseq = self.deepseq_1_1_0_0; + cabalInstall = self.cabalInstall_0_8_2; + alex = self.alex_2_3_3; + happy = self.happy_1_18_5; + haddock = self.haddock_2_7_2; + }; + + haskellPlatformDefaults_2010_2_0_0 = + self : self.haskellPlatformArgs_2010_2_0_0 self // { + haskellPlatform = self.haskellPlatform_2010_2_0_0; + }; + + haskellPlatform_2010_2_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix + (self.haskellPlatformArgs_2010_2_0_0 self); + + haskellPlatformArgs_2010_1_0_0 = self : { + inherit (self) cabal ghc; + haskellSrc = self.haskellSrc_1_0_1_3; + html = self.html_1_0_1_2; + fgl = self.fgl_5_4_2_2; + cabalInstall = self.cabalInstall_0_8_0; + GLUT = self.GLUT_2_1_2_1; + OpenGL = self.OpenGL_2_2_3_0; + zlib = self.zlib_0_5_2_0; + alex = self.alex_2_3_2; + cgi = self.cgi_3001_1_7_2; + QuickCheck = self.QuickCheck_2_1_0_3; + HTTP = self.HTTP_4000_0_9; + HUnit = self.HUnit_1_2_2_1; + network = self.network_2_2_1_7; + parallel = self.parallel_2_2_0_1; + parsec = self.parsec_2_1_0_1; + regexBase = self.regexBase_0_93_1; + regexCompat = self.regexCompat_0_92; + regexPosix = self.regexPosix_0_94_1; + stm = self.stm_2_1_1_2; + xhtml = self.xhtml_3000_2_0_1; + haddock = self.haddock_2_7_2; + happy = self.happy_1_18_4; + }; + + haskellPlatformDefaults_2010_1_0_0 = + self : self.haskellPlatformArgs_2010_1_0_0 self // { + haskellPlatform = self.haskellPlatform_2010_1_0_0; + }; + + haskellPlatform_2010_1_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix + (self.haskellPlatformArgs_2010_1_0_0 self); + + haskellPlatformArgs_2009_2_0_2 = self : { + inherit (self) cabal ghc editline time; + haddock = self.haddock_2_4_2; + cgi = self.cgi_3001_1_7_1; + fgl = self.fgl_5_4_2_2; + GLUT = self.GLUT_2_1_1_2; + haskellSrc = self.haskellSrc_1_0_1_3; + html = self.html_1_0_1_2; + HUnit = self.HUnit_1_2_0_3; + network = self.network_2_2_1_4; + OpenGL = self.OpenGL_2_2_1_1; + parallel = self.parallel_1_1_0_1; + parsec = self.parsec_2_1_0_1; + QuickCheck = self.QuickCheck_1_2_0_0; + regexBase = self.regexBase_0_72_0_2; + regexCompat = self.regexCompat_0_71_0_1; + regexPosix = self.regexPosix_0_72_0_3; + stm = self.stm_2_1_1_2; + xhtml = self.xhtml_3000_2_0_1; + zlib = self.zlib_0_5_0_0; + HTTP = self.HTTP_4000_0_6; + cabalInstall = self.cabalInstall_0_6_2; + alex = self.alex_2_3_1; + happy = self.happy_1_18_4; + }; + + haskellPlatformDefaults_2009_2_0_2 = + self : self.haskellPlatformArgs_2009_2_0_2 self // { + haskellPlatform = self.haskellPlatform_2009_2_0_2; + }; + + haskellPlatform_2009_2_0_2 = + callPackage ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix + (self.haskellPlatformArgs_2009_2_0_2 self); + # Haskell libraries. Agda = callPackage ../development/libraries/haskell/Agda { - QuickCheck = QuickCheck_2; + # I've been trying to get the latest Agda to build with ghc-6.12, too, + # but failed so far. + # mtl = self.mtl2; + # QuickCheck = self.QuickCheck2; + syb = self.syb02; }; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; @@ -72,18 +311,16 @@ rec { cereal = callPackage ../development/libraries/haskell/cereal {}; - cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix { - network = network_2_2_1_7; - }; - - cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix { - network = network_2_2_1_7; - }; - - cgi = callPackage ../development/libraries/haskell/cgi {}; + cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {}; + cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; + cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; + cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; + cgi = self.cgi_3001_1_7_1; Chart = callPackage ../development/libraries/haskell/Chart {}; + citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; + cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; @@ -93,19 +330,18 @@ rec { ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; convertible = callPackage ../development/libraries/haskell/convertible { - time = time_1_1_3; + time = self.time_1_1_3; }; criterion = callPackage ../development/libraries/haskell/criterion { - parallel = parallel_2_2_0_1; - parsec = parsec_3; + parsec = self.parsec3; }; Crypto = callPackage ../development/libraries/haskell/Crypto {}; CS173Tourney = callPackage ../development/libraries/haskell/CS173Tourney { inherit (pkgs) fetchgit; - json = json_0_3_6; + json = self.json_0_3_6; }; csv = callPackage ../development/libraries/haskell/csv {}; @@ -118,9 +354,13 @@ rec { dataReify = callPackage ../development/libraries/haskell/data-reify {}; - datetime = callPackage ../development/libraries/haskell/datetime {}; + datetime = callPackage ../development/libraries/haskell/datetime { + QuickCheck = self.QuickCheck1; + }; - deepseq = callPackage ../development/libraries/haskell/deepseq {}; + deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; + deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; + deepseq = self.deepseq_1_1_0_0; derive = callPackage ../development/libraries/haskell/derive {}; @@ -130,6 +370,8 @@ rec { inherit (pkgs) zlib; }; + dlist = callPackage ../development/libraries/haskell/dlist {}; + dotgen = callPackage ../development/libraries/haskell/dotgen {}; editline = callPackage ../development/libraries/haskell/editline { @@ -152,9 +394,9 @@ rec { filestore = callPackage ../development/libraries/haskell/filestore {}; - fgl = callPackage ../development/libraries/haskell/fgl {}; - + fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; + fgl = self.fgl_5_4_2_2; fingertree = callPackage ../development/libraries/haskell/fingertree {}; @@ -164,7 +406,9 @@ rec { ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; - ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; + ghcEvents = callPackage ../development/libraries/haskell/ghc-events { + mtl = self.mtl1; + }; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; @@ -176,11 +420,7 @@ rec { ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; - gitit = callPackage ../development/libraries/haskell/gitit { - cgi = cgi_3001_1_7_2; - HTTP = HTTP_4000_0_9; - network = network_2_2_1_7; - }; + gitit = callPackage ../development/libraries/haskell/gitit {}; glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs) pkgconfig gnome glibc; @@ -192,32 +432,26 @@ rec { GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; - GLUT2121 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix { - OpenGL = OpenGL_2_2_3_0; + GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix { glut = pkgs.freeglut; inherit (pkgs) mesa; inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; - GLUT = callPackage ../development/libraries/haskell/GLUT { + GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix { glut = pkgs.freeglut; inherit (pkgs) mesa; inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; + GLUT = self.GLUT_2_1_1_2; + gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs) pkgconfig glibc; inherit (pkgs.gtkLibs) gtk; }; - gtk2hs = callPackage ../development/libraries/haskell/gtk2hs { - inherit (pkgs) pkgconfig gnome cairo; - }; - - gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools { - alex = alex_2_3_3; - happy = happy_1_18_5; - }; + gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { inherit (pkgs) pkgconfig glibc; @@ -225,43 +459,21 @@ rec { gtkC = pkgs.gtkLibs.gtk; }; - Graphalyze = callPackage ../development/libraries/haskell/Graphalyze { - fgl = fgl_5_4_2_3; - }; + Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {}; - graphviz = callPackage ../development/libraries/haskell/graphviz { - fgl = fgl_5_4_2_3; - }; + graphviz = callPackage ../development/libraries/haskell/graphviz {}; - hakyll = callPackage ../development/libraries/haskell/hakyll { - regexBase = regexBase_0_93_2; - network = network_2_2_1_7; - time = time_1_2_0_3; - pandoc = pandoc_newtime; - }; + hakyll = callPackage ../development/libraries/haskell/hakyll {}; hamlet = callPackage ../development/libraries/haskell/hamlet {}; - HAppSData = callPackage ../development/libraries/haskell/HAppS/HAppS-Data.nix {}; - - HAppSIxSet = callPackage ../development/libraries/haskell/HAppS/HAppS-IxSet.nix {}; - - HAppSUtil = callPackage ../development/libraries/haskell/HAppS/HAppS-Util.nix {}; - - HAppSServer = callPackage ../development/libraries/haskell/HAppS/HAppS-Server.nix {}; - - HAppSState = callPackage ../development/libraries/haskell/HAppS/HAppS-State.nix {}; - happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix { - HaXml = HaXml_1_13_3; + HaXml = self.HaXml113; }; happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {}; - happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix { - network = network_2_2_1_7; - HaXml = HaXml_1_13_3; - }; + happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {}; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; @@ -271,96 +483,31 @@ rec { haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {}; - haskellSrc = callPackage ../development/libraries/haskell/haskell-src {}; - - haskellSrc_P = callPackage ../development/libraries/haskell/haskell-src { - happy = happy_1_18_5; - }; + haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; + haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; + haskellSrc = self.haskellSrc_1_0_1_3; haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {}; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; - haskellPlatform = haskellPlatform_2010_2_0_0; - - haskellPlatformArgs_2010_2_0_0 = { - inherit cabal ghc html xhtml; - haskellSrc = haskellSrc_P; - fgl = fgl_5_4_2_3; - cabalInstall = cabalInstall_0_8_2; - GLUT = GLUT2121; - OpenGL = OpenGL_2_2_3_0; - zlib = zlib_0_5_2_0; - alex = alex_2_3_3; - cgi = cgi_3001_1_7_3; - QuickCheck = QuickCheck_2; - HTTP = HTTP_4000_0_9; - HUnit = HUnit_1_2_2_1; - network = network_2_2_1_7; - parallel = parallel_2_2_0_1; - regexBase = regexBase_0_93_2; - regexCompat = regexCompat_0_93_1; - regexPosix = regexPosix_0_94_2; - stm = stm_2_1_2_1; - haddock = haddock_2_7_2_P; - happy = happy_1_18_5; - }; - - haskellPlatformDefaults_2010_2_0_0 = haskellPlatformArgs_2010_2_0_0 // { - haskellPlatform = haskellPlatform_2010_2_0_0; - }; - - haskellPlatform_2010_2_0_0 = callPackage ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix haskellPlatformArgs_2010_2_0_0; - - haskellPlatform_2010_1_0_0 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix { - inherit cabal ghc fgl - haskellSrc html - stm xhtml; - cabalInstall = cabalInstall_0_8_0; - GLUT = GLUT2121; - OpenGL = OpenGL_2_2_3_0; - zlib = zlib_0_5_2_0; - alex = alex_2_3_2; - cgi = cgi_3001_1_7_2; - QuickCheck = QuickCheck_2_1_0_3; - HTTP = HTTP_4000_0_9; - HUnit = HUnit_1_2_2_1; - network = network_2_2_1_7; - parallel = parallel_2_2_0_1; - regexBase = regexBase_0_93_1; - regexCompat = regexCompat_0_92; - regexPosix = regexPosix_0_94_1; - haddock = haddock_2_7_2; - happy = happy_1_18_4; - inherit (pkgs) fetchurl; - }); - - haskellPlatform_2009_2_0_2 = import ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix { - inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline - haskellSrc html parallel regexBase regexCompat regexPosix - stm time xhtml zlib cabalInstall alex happy; - haddock = haddock_2_4_2; - inherit (pkgs) fetchurl; - }; - - HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix { - network = network_2_2_1_7; - }; - - HTTP = callPackage ../development/libraries/haskell/HTTP {}; - - HTTP_3001 = callPackage ../development/libraries/haskell/HTTP/3001.nix {}; + HTTP_3001_1_5 = callPackage ../development/libraries/haskell/HTTP/3001.1.5.nix {}; + HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; + HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; + HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; + HTTP = self.HTTP_4000_0_6; haxr = callPackage ../development/libraries/haskell/haxr { - HTTP = HTTP_4000_0_9; - HaXml = HaXml_1_13_3; + HaXml = self.HaXml113; }; haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; - HaXml = callPackage ../development/libraries/haskell/HaXml {}; - HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {}; + HaXml_1_20_2 = callPackage ../development/libraries/haskell/HaXml/1.20.2.nix {}; + HaXml113 = self.HaXml_1_13_3; + HaXml120 = self.HaXml_1_20_2; + HaXml = self.HaXml120; HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; @@ -377,7 +524,7 @@ rec { highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; hint = callPackage ../development/libraries/haskell/hint { - ghcPaths = ghcPaths_0_1_0_6; + ghcPaths = self.ghcPaths_0_1_0_6; }; Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {}; @@ -400,22 +547,22 @@ rec { hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; - html = callPackage ../development/libraries/haskell/html {}; + html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; + html = self.html_1_0_1_2; - httpdShed = callPackage ../development/libraries/haskell/httpd-shed { - network = network_2_2_1_7; - }; + httpdShed = callPackage ../development/libraries/haskell/httpd-shed {}; + HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; - - HUnit = callPackage ../development/libraries/haskell/HUnit {}; + HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; + HUnit = self.HUnit_1_2_0_3; ivor = callPackage ../development/libraries/haskell/ivor {}; jpeg = callPackage ../development/libraries/haskell/jpeg {}; JsContracts = callPackage ../development/libraries/haskell/JsContracts { - WebBits = WebBits_1_0; + WebBits = self.WebBits_1_0; }; json = callPackage ../development/libraries/haskell/json {}; @@ -423,7 +570,7 @@ rec { json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {}; leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix { - network = network_2_2_1_7; + network = self.network_2_2_1_7; }; ltk = callPackage ../development/libraries/haskell/ltk {}; @@ -436,9 +583,7 @@ rec { MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; - MissingH = callPackage ../development/libraries/haskell/MissingH { - network = network_2_2_1_7; - }; + MissingH = callPackage ../development/libraries/haskell/MissingH {}; mmap = callPackage ../development/libraries/haskell/mmap {}; @@ -454,7 +599,12 @@ rec { mpppc = callPackage ../development/libraries/haskell/mpppc {}; - mtl = callPackage ../development/libraries/haskell/mtl {}; + mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; + mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; + mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; + mtl1 = self.mtl_1_1_0_2; + mtl2 = self.mtl_2_0_1_0; + mtl = self.mtl1; multiplate = callPackage ../development/libraries/haskell/multiplate {}; @@ -466,9 +616,10 @@ rec { neither = callPackage ../development/libraries/haskell/neither {}; + network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; - - network = callPackage ../development/libraries/haskell/network {}; + network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; + network = self.network_2_2_1_4; nonNegative = callPackage ../development/libraries/haskell/non-negative {}; @@ -478,41 +629,39 @@ rec { inherit (pkgs) openal; }; + OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix { + inherit (pkgs) mesa; + inherit (pkgs.xlibs) libX11; + }; + OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix { inherit (pkgs) mesa; inherit (pkgs.xlibs) libX11; }; - OpenGL = callPackage ../development/libraries/haskell/OpenGL { - inherit (pkgs) mesa; - inherit (pkgs.xlibs) libX11; - }; + OpenGL = self.OpenGL_2_2_1_1; - pandoc = callPackage ../development/libraries/haskell/pandoc { - HTTP = HTTP_4000_0_9; - network = network_2_2_1_7; - }; + pandoc = callPackage ../development/libraries/haskell/pandoc {}; - pandoc_newtime = callPackage ../development/libraries/haskell/pandoc { - HTTP = HTTP_4000_0_9; - network = network_2_2_1_7; - random = random_newtime; - }; + pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; pango = callPackage ../development/libraries/haskell/pango { inherit (pkgs) pkgconfig glibc; inherit (pkgs.gtkLibs) pango; }; + parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; - - parallel = callPackage ../development/libraries/haskell/parallel {}; + parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; + parallel = self.parallel_1_1_0_1; parseargs = callPackage ../development/libraries/haskell/parseargs {}; - parsec = callPackage ../development/libraries/haskell/parsec {}; - - parsec_3 = callPackage ../development/libraries/haskell/parsec/3.nix {}; + parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {}; + parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; + parsec2 = self.parsec_2_1_0_1; + parsec3 = self.parsec_3_1_1; + parsec = self.parsec2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -534,80 +683,66 @@ rec { pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {}; - QuickCheck = QuickCheck_1; - - QuickCheck_1 = callPackage ../development/libraries/haskell/QuickCheck {}; - + QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; + QuickCheck_1_2_0_1 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.1.nix {}; QuickCheck_2_1_0_3 = callPackage ../development/libraries/haskell/QuickCheck/2.1.0.3.nix {}; - - QuickCheck_2 = callPackage ../development/libraries/haskell/QuickCheck/QuickCheck-2.nix {}; + QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; + QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; + QuickCheck1 = self.QuickCheck_1_2_0_1; + QuickCheck2 = self.QuickCheck_2_4_0_1; + QuickCheck = self.QuickCheck2; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; random_newtime = callPackage ../development/libraries/haskell/random { - time = time_1_2_0_3; + time = self.time_1_2_0_3; }; readline = callPackage ../development/libraries/haskell/readline { inherit (pkgs) readline ncurses; }; - recaptcha = callPackage ../development/libraries/haskell/recaptcha { - HTTP = HTTP_4000_0_9; - network = network_2_2_1_7; - }; + recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; - regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; + regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; + regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; + regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; + regexBase = self.regexBase_0_72_0_2; - regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; + regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; + regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; + regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; + regexCompat = self.regexCompat_0_71_0_1; - regexBase = callPackage ../development/libraries/haskell/regex-base {}; + regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; + regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; + regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; + regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; + regexPosix = self.regexPosix_0_72_0_3; - regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix { - regexBase = regexBase_0_93_1; - regexPosix = regexPosix_0_94_1; - }; - - regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix { - regexBase = regexBase_0_93_2; - regexPosix = regexPosix_0_94_2; - }; - - regexCompat = callPackage ../development/libraries/haskell/regex-compat {}; - - regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix { - regexBase = regexBase_0_93_1; - }; - - regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix { - regexBase = regexBase_0_93_2; - }; - - regexPosix = callPackage ../development/libraries/haskell/regex-posix {}; - - regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa { - regexBase = regexBase_0_93_2; - }; + regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; regular = callPackage ../development/libraries/haskell/regular {}; safe = callPackage ../development/libraries/haskell/safe {}; - salvia = callPackage ../development/libraries/haskell/salvia { - network = network_2_2_1_7; - }; + salvia = callPackage ../development/libraries/haskell/salvia {}; salviaProtocol = callPackage ../development/libraries/haskell/salvia-protocol {}; scion = callPackage ../development/libraries/haskell/scion {}; - sendfile = callPackage ../development/libraries/haskell/sendfile { - network = network_2_2_1_7; - }; + sendfile = callPackage ../development/libraries/haskell/sendfile {}; statistics = callPackage ../development/libraries/haskell/statistics {}; - syb = callPackage ../development/libraries/haskell/syb {}; + # TODO: investigate status of syb in older platform versions + syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; + syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; + syb02 = self.syb_0_2_2; + syb03 = self.syb_0_3; + syb = null; # by default, we assume that syb ships with GHC, which is + # true for the older GHC versions sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {}; @@ -637,45 +772,48 @@ rec { ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {}; - SMTPClient = callPackage ../development/libraries/haskell/SMTPClient { - network = network_2_2_1_7; - }; + SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; split = callPackage ../development/libraries/haskell/split {}; stbImage = callPackage ../development/libraries/haskell/stb-image {}; - stm = callPackage ../development/libraries/haskell/stm {}; - + stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {}; stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {}; + stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; + stm = self.stm_2_1_1_2; storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {}; + svgcairo = callPackage ../development/libraries/haskell/svgcairo {}; + + tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; + terminfo = callPackage ../development/libraries/haskell/terminfo { - inherit extensibleExceptions /* only required for <= ghc6102 ?*/; + inherit (self) extensibleExceptions /* only required for <= ghc6102 ?*/; inherit (pkgs) ncurses; }; testpack = callPackage ../development/libraries/haskell/testpack {}; - texmath = callPackage ../development/libraries/haskell/texmath { - cgi = cgi_3001_1_7_2; - }; + texmath = callPackage ../development/libraries/haskell/texmath {}; - text = callPackage ../development/libraries/haskell/text {}; + text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; + text = self.text_0_11_0_5; threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; - /* time is Haskell Platform default, other time versions are more recent but incompatible */ - time = callPackage ../development/libraries/haskell/time {}; - - time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; - + time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; + time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {}; + # time is in the core package set. It should only be necessary to + # pass it explicitly in rare circumstances. + time = null; - transformers = callPackage ../development/libraries/haskell/transformers {}; + transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; + transformers = self.transformers_0_2_2_0; uniplate = callPackage ../development/libraries/haskell/uniplate {}; @@ -694,7 +832,7 @@ rec { uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {}; vacuum = callPackage ../development/libraries/haskell/vacuum { - ghcPaths = ghcPaths_0_1_0_6; + ghcPaths = self.ghcPaths_0_1_0_6; }; vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {}; @@ -708,18 +846,20 @@ rec { vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; vty = callPackage ../development/libraries/haskell/vty { - parallel = parallel_2_2_0_1; + mtl = self.mtl2; }; - WebBits = callPackage ../development/libraries/haskell/WebBits {}; + WebBits = callPackage ../development/libraries/haskell/WebBits { + parsec = self.parsec2; + }; - WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {}; + WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { + parsec = self.parsec2; + }; WebBitsHtml = callPackage ../development/libraries/haskell/WebBits-Html {}; - webRoutes = callPackage ../development/libraries/haskell/web-routes { - network = network_2_2_1_7; - }; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {}; @@ -728,13 +868,13 @@ rec { }; WebServerExtras = callPackage ../development/libraries/haskell/WebServer-Extras { - json = json_0_3_6; + json = self.json_0_3_6; inherit (pkgs) fetchgit; }; CouchDB = callPackage ../development/libraries/haskell/CouchDB { - HTTP = HTTP_3001; - json = json_0_3_6; + HTTP = self.HTTP_3001_1_5; + json = self.json_0_3_6; }; base64string = callPackage ../development/libraries/haskell/base64-string {}; @@ -747,6 +887,8 @@ rec { inherit (pkgs.xlibs) libX11; }; + wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; + X11 = callPackage ../development/libraries/haskell/X11 { inherit (pkgs.xlibs) libX11 libXinerama libXext; xineramaSupport = true; @@ -757,17 +899,20 @@ rec { inherit (pkgs.xlibs) libXft; }; - xhtml = callPackage ../development/libraries/haskell/xhtml {}; + xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; + xhtml = self.xhtml_3000_2_0_1; xml = callPackage ../development/libraries/haskell/xml {}; + xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; + yst = callPackage ../development/libraries/haskell/yst {}; zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; zipper = callPackage ../development/libraries/haskell/zipper {}; - zlib = callPackage ../development/libraries/haskell/zlib { + zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; @@ -775,6 +920,12 @@ rec { inherit (pkgs) zlib; }; + zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { + inherit (pkgs) zlib; + }; + + zlib = self.zlib_0_5_0_0; + # Compilers. ehc = callPackage ../development/compilers/ehc { @@ -784,7 +935,7 @@ rec { epic = callPackage ../development/compilers/epic {}; flapjax = callPackage ../development/compilers/flapjax { - WebBits = WebBits_1_0; + WebBits = self.WebBits_1_0; }; helium = callPackage ../development/compilers/helium {}; @@ -793,49 +944,35 @@ rec { # Development tools. - alex = callPackage ../development/tools/parsing/alex {}; - + alex_2_3_1 = callPackage ../development/tools/parsing/alex/2.3.1.nix {}; alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {}; - alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {}; + alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; + alex = self.alex_2_3_1; cpphs = callPackage ../development/tools/misc/cpphs {}; frown = callPackage ../development/tools/parsing/frown {}; - haddock = haddock_2_7_2_P; - - haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/haddock-2.4.2.nix {}; - - haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/haddock-2.7.2.nix { - alex = alex_2_3_2; - happy = happy_1_18_4; - ghcPaths = ghcPaths_0_1_0_6; + haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; + haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { + ghcPaths = self.ghcPaths_0_1_0_6; }; - - haddock_2_7_2_P = callPackage ../development/tools/documentation/haddock/haddock-2.7.2.nix { - alex = alex_2_3_3; - happy = happy_1_18_5; - ghcPaths = ghcPaths_0_1_0_6; + haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix { + ghcPaths = self.ghcPaths_0_1_0_6; }; + haddock = self.haddock_2_7_2; - happy = happy_1_18_4; + happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; + happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; + happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; + happy = self.happy_1_18_4; - happy_1_17 = callPackage ../development/tools/parsing/happy/happy-1.17.nix {}; - - happy_1_18_4 = callPackage ../development/tools/parsing/happy/happy-1.18.4.nix {}; - - happy_1_18_5 = callPackage ../development/tools/parsing/happy/happy-1.18.5.nix {}; - - HaRe = callPackage ../development/tools/haskell/HaRe { - network = network_2_2_1_7; - }; + HaRe = callPackage ../development/tools/haskell/HaRe {}; hlint = callPackage ../development/tools/haskell/hlint {}; - hslogger = callPackage ../development/tools/haskell/hslogger { - network = network_2_2_1_7; - }; + hslogger = callPackage ../development/tools/haskell/hslogger {}; mkcabal = callPackage ../development/tools/haskell/mkcabal {}; @@ -848,13 +985,13 @@ rec { # Applications. darcs = callPackage ../applications/version-management/darcs/darcs-2.nix { - zlib = zlib_0_5_2_0; inherit (pkgs) curl; + parsec = self.parsec2; }; leksah = callPackage ../applications/editors/leksah { - network = network_2_2_1_7; - regexBase = regexBase_0_93_2; + network = self.network_2_2_1_7; + regexBase = self.regexBase_0_93_2; inherit (pkgs) makeWrapper; }; @@ -868,19 +1005,11 @@ rec { # Tools. - cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix { - HTTP = HTTP_4000_0_9; - network = network_2_2_1_7; - zlib = zlib_0_5_2_0; - }; - - cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix { - HTTP = HTTP_4000_0_9; - network = network_2_2_1_7; - zlib = zlib_0_5_2_0; - }; - - cabalInstall = callPackage ../tools/package-management/cabal-install {}; + cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; + cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; + cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; + cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; + cabalInstall = self.cabalInstall_0_6_2; lhs2tex = callPackage ../tools/typesetting/lhs2tex { inherit (pkgs) tetex polytable; @@ -898,4 +1027,4 @@ rec { }; -in result +in result.final diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 57bd22e59f8c..e60ec56fbb61 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -400,13 +400,10 @@ with (import ./release-lib.nix); haskellPackages_ghc6104 = { ghc = ghcSupported; - gtk2hs = linux; haskellPlatform_2009_2_0_2 = ghcSupported; - xmonad = linux; }; haskellPackages_ghc6121 = { - darcs = ghcSupported; ghc = ghcSupported; haskellPlatform_2010_1_0_0 = ghcSupported; }; @@ -427,7 +424,13 @@ with (import ./release-lib.nix); }; haskellPackages_ghc702 = { + darcs = ghcSupported; ghc = ghcSupported; + gitit = linux; + gtk = linux; + haskellPlatform_2011_2_0_0 = ghcSupported; + lhs2tex = ghcSupported; + xmonad = linux; }; kde3 = {