Support for profiling (all libraries) enabled by custom config

moved flapjax to ghcExecutables
added haskelldb mysql
added ghc darcs build (left in comments)

svn path=/nixpkgs/trunk/; revision=11742

3 files changed, 106 insertions, 5 deletions

diff --git a/pkgs/misc/bleeding-edge-fetch-info/haskellnet.nix b/pkgs/misc/bleeding-edge-fetch-info/haskellnet.nix
new file mode 100644
index 000000000000..b5102f6d04d8
--- /dev/null
+++ b/pkgs/misc/bleeding-edge-fetch-info/haskellnet.nix
@@ -0,0 +1,3 @@
+ args: with args; fetchurl { 
+  url = http://mawercer.de/~nix/repos/haskellnet.tar.gz;
+  sha256 = "fde6f79b09d6cfbc6021aed9fa54ed186715a6eaacd4634f07554d4d3777f70d";}
diff --git a/pkgs/misc/ghc68extraLibs/default.nix b/pkgs/misc/ghc68extraLibs/default.nix
index d1f9602face8..2dc796c3cd31 100644
--- a/pkgs/misc/ghc68extraLibs/default.nix
+++ b/pkgs/misc/ghc68extraLibs/default.nix
@@ -29,10 +29,27 @@ rec {
           quickcheck = { name="QuickCheck-1.1.0.0"; srcDir="libraries/QuickCheck"; p_deps=[x.base x.random]; src = ghc.extra_src; };
           tagsoup = { name = "tagsoup-0.4"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/tagsoup/0.4/tagsoup-0.4.tar.gz; sha256 = "0rdy303qaw63la1fhw1z8h6k8cs33f71955pwlzxyx0n45g58hc7";};  p_deps = [ x.base x.mtl x.network ]; };
           hxt = { name = "hxt-7.5"; src =fetchurl { url = http://hackage.haskell.org/packages/archive/hxt/7.5/hxt-7.5.tar.gz; sha256 ="00q6m90a4qm4d5cg1x9r6b7f0rszcf2y7ifzs9mvy9kmzfl5ga7n"; };  p_deps = [x.base x.haskell98 x.http_darcs x.hunit x.network x.parsec x.tagsoup ]; };
-
-
+          haskellnet = { name = "HaskellNet-0.2"; src = sourceByName "haskellnet"; p_deps = [ x.base x.haskell98 x.network x.crypto x.mtl x.parsec x.time x.haxml x.bytestring x.pretty x.array x.dataenc x.containers x.old_locale x.old_time ]; 
+             pass = { 
+               patchPhase = "
+                 patch -p1 < \$patch
+                 sed -i 's/mtl/mtl, bytestring, pretty, array, dataenc, containers, old-locale, old-time/' *.cabal
+                 "; 
+               patch= ./haskellnetPatch ; 
+             };
+          };
+          dataenc = { name = "dataenc-0.10.2"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/dataenc/0.10.2/dataenc-0.10.2.tar.gz; sha256="1kl087994ajbwy65f24qjnz6wchlhmk5vkdw1506zzfbi5fr6x7r"; }; p_deps = [ x.base ]; };
           # other pacakges  (hackage etc)
           polyparse = { name = "polyparse-2.3"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/polyparse/1.1/polyparse-1.1.tar.gz; sha256 = "0mrrk3hhfrn68xn5y4jfg4ba0pa08bj05l007862vrxyyb4bksl7"; }; p_deps = [ x.base x.haskell98 ]; };
+          hsHaruPDF = { name = "HsHaruPDF-0.0.0"; src = fetchurl{url= "http://hackage.haskell.org/packages/archive/HsHaruPDF/0.0.0/HsHaruPDF-0.0.0.tar.gz"; sha256="1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";}; p_deps = [ x.base x.haskell98 ]; 
+                        pass = { buildInputs = [ mysql zlib libpng ]; 
+                          patchPhase = "
+                            sed 's/include-dirs:.*/include-dirs: haru/'  -i HsHaruPDF.cabal
+                            sed 's=extra-lib-dirs:.*=extra-lib-dirs: ${libpng}/lib ${zlib}/lib=' -i HsHaruPDF.cabal
+                            ";
+                        };
+          };
+          # hint = { name="hint-0.1"; src = fetchurl { url = "http://hackage.haskell.org/packages/archive/hint/0.1/hint-0.1.tar.gz"; sha256 = "1adydl2la4lxxl6zz24lm4vbdrsi4bkpppzxhpkkmzsjhhkpf2f9"; }; p_deps = [ x.base x.ghc x.haskellSrc x.mtl ]; };
           timeout = { name="timeout-0.1.2"; src = fetchurl{ url = http://hackage.haskell.org/packages/archive/control-timeout/0.1.2/control-timeout-0.1.2.tar.gz; sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg";}; p_deps = [ x.base x.time x.stm ]; };
           parsec3  = { name="parsec-3.0.0";  p_deps=[ x.base x.mtl x.bytestring ];  src = fetchurl { url = "http://hackage.haskell.org/packages/archive/parsec/3.0.0/parsec-3.0.0.tar.gz"; sha256 = "0fqryy09y8h7z0hlayg5gpavghgwa0g3bldynwl17ks8l87ykj7a"; }; };
 
@@ -63,7 +80,7 @@ rec {
                         src = sourceByName "hsql";
                       pass = {  srcDir = "HSQL"; };
               };
-          hsqlMysqlDarcs = { name = "hsql-mysql-darcs"; srcDir = "MySQL"; src = sourceByName "pg_hsql"; p_deps = [ x.base x.hsqlDarcs x.old_time ];
+          hsqlMysqlDarcs = { name = "hsql-mysql-darcs"; srcDir = "MySQL"; src = sourceByName "hsql"; p_deps = [ x.base x.hsqlDarcs x.old_time ];
                         pass = { buildInputs = [ mysql zlib ];
                                  patchPhase = "echo      \"  extra-lib-dirs: ${zlib}/lib\" >> MySQL/hsql-mysql.cabal";
                                };
@@ -147,12 +164,13 @@ rec {
                         name = "wxhaskel-${wxVersion}"; p_deps = [ x.haskell98 x.mtl x.bytestring x.parsec3 pkgconfig wxGTK  ] ++ (with gtkLibs; [ glib pango gtk gnome.glib]);
                         src = wxSrc;
                         pass = {
+                          profiling = if getConfig [ "ghc68" "profiling" ] false then "--hcprof" else "";
                           buildInputs = [ unzip ];
                           buildPhase = "
                             createEmptyPackageDatabaseAndSetupHook
                             export GHC_PACKAGE_PATH
                             sed -e 's/which/type -p/g' configure
-                            ./configure --prefix=\$out --package-conf=\$PACKAGE_DB
+                            ./configure --prefix=\$out --package-conf=\$PACKAGE_DB \$profiling
                             make
                             ensureDir \$out
                             make install
@@ -187,8 +205,22 @@ rec {
                       pass = { buildInputs = (with executables; [ happy alex ] ); };
                     };
 
-          /*
+          # haskelldb 
+          haskelldb = { name = "haskelldb-0.10"; src = fetchurl  { url = "http://hackage.haskell.org/packages/archive/haskelldb/0.10/haskelldb-0.10.tar.gz"; sha256 = "1i4kgsgajr9cijg0a2c04rn1zqwiasfvdbvs8c5qm49vkbdzm7l5"; }; p_deps = [ x.base x.haskell98 x.mtl x.pretty x.old_time x.directory x.old_locale]; 
+                    pass = { patchPhase = "sed -i 's/mtl/mtl, pretty, old-time, directory, old-locale/' haskelldb.cabal
+                                            echo 'ghc-options: -O2 -fglasgow-exts -fallow-undecidable-instances' >> haskelldb.cabal"; };
+          };
+            #hsql drivers
+
+          haskelldbHsql = { name= "haskelldb-hsql--0.10"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/haskelldb-hsql/0.10/haskelldb-hsql-0.10.tar.gz; sha256 = "0s3bjm080hzw23zjxr4412m81v408ll9y6gqb2yyw30n886ixzgh"; }; p_deps = [ x.base x.haskell98 x.mtl x.hsqlDarcs x.haskelldb x.old_time x.old_locale ]; 
+                    pass = { patchPhase = "sed -i 's/mtl/mtl, pretty, old-time, directory, old-locale/' haskelldb-hsql.cabal
+                                            echo 'ghc-options: -O2 -fglasgow-exts -fallow-undecidable-instances' >> haskelldb-hsql.cabal"; };
+                    };
+          haskelldbHsqlMysql = { name= "haskelldb-hsql-mysql-0.10"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/haskelldb-hsql-mysql/0.10/haskelldb-hsql-mysql-0.10.tar.gz; sha256 = "0nfgq0xn45rhwxr8jvawviqfhgvhqr56l7ki1d72605y34dfx7rw"; }; p_deps = [ x.base x.haskell98 x.mtl x.hsqlDarcs x.haskelldbHsql x.hsqlMysqlDarcs x.haskelldb ]; 
+          };
+
 
+          /*
           haskelldb-hsql-postgresql-0.10.tar.gz
           ######################################################################## 100.0%
           hash is 00nva5hhaknm5via4c1p2wj7ibyn6q874f0c3izjb9dk7rivfvgv
diff --git a/pkgs/misc/ghc68extraLibs/haskellnetPatch b/pkgs/misc/ghc68extraLibs/haskellnetPatch
new file mode 100644
index 000000000000..fd7a280683df
--- /dev/null
+++ b/pkgs/misc/ghc68extraLibs/haskellnetPatch
@@ -0,0 +1,66 @@
+diff -rN -U3 old-pg_haskellnet/HaskellNet/Auth.hs new-pg_haskellnet/HaskellNet/Auth.hs
+--- old-pg_haskellnet/HaskellNet/Auth.hs	2008-04-22 19:21:58.000000000 +0200
++++ new-pg_haskellnet/HaskellNet/Auth.hs	2008-04-22 19:21:58.000000000 +0200
+@@ -21,6 +21,7 @@
+ import Data.List
+ import Data.Bits
+ import Data.Array
++import Data.Maybe
+ 
+ type UserName = String
+ type Password = String
+@@ -41,7 +42,7 @@
+ b64Encode = map (toEnum.fromEnum) . B64.encode . map (toEnum.fromEnum)
+ 
+ b64Decode :: String -> String
+-b64Decode = map (toEnum.fromEnum) . B64.decode . map (toEnum.fromEnum)
++b64Decode = map (toEnum.fromEnum) . fromJust . B64.decode . map (toEnum.fromEnum)
+ 
+ showOctet :: [Octet] -> String
+ showOctet = concat . map hexChars
+diff -rN -U3 old-pg_haskellnet/haskellnet.cabal new-pg_haskellnet/haskellnet.cabal
+--- old-pg_haskellnet/haskellnet.cabal	2008-04-22 19:21:58.000000000 +0200
++++ new-pg_haskellnet/haskellnet.cabal	2008-04-22 19:21:58.000000000 +0200
+@@ -3,7 +3,7 @@
+ Author:         Jun Mukai
+ License:        BSD3
+ Category:       Network
+-Build-Depends:  base, haskell98, network, Crypto, mtl, parsec, time, HaXml
++Build-Depends:  base, haskell98, network, Crypto, mtl, parsec, time, HaXml, bytestring, pretty, array, dataenc, containers, old-locale, old-time
+ Synopsis:       network related libraries such as HTTP, POP3, SMTP
+ Exposed-modules:
+    Text.IMAPParsers,
+diff -rN -U3 old-pg_haskellnet/Text/Atom.hs new-pg_haskellnet/Text/Atom.hs
+--- old-pg_haskellnet/Text/Atom.hs	2008-04-22 19:21:58.000000000 +0200
++++ new-pg_haskellnet/Text/Atom.hs	2008-04-22 19:21:58.000000000 +0200
+@@ -38,7 +38,8 @@
+ import Data.Map (findWithDefault, insert, Map)
+ import qualified Data.Map as M
+ import Data.Monoid (Sum(..))
+-import Data.Time.LocalTime (LocalTime(..), TimeOfDay(..), ZonedTime(..), TimeZone(..), formatTime, minutesToTimeZone, utc)
++import Data.Time.Format (formatTime)
++import Data.Time.LocalTime (LocalTime(..), TimeOfDay(..), ZonedTime(..), TimeZone(..), minutesToTimeZone, utc)
+ import System.Locale (defaultTimeLocale)
+ import Data.Time.Calendar
+ import Text.XML.HaXml hiding (version)
+@@ -55,7 +56,7 @@
+ b64Encode :: String -> String
+ b64Encode = map e2e . B64.encode . map e2e
+ b64Decode :: String -> String
+-b64Decode = map e2e . B64.decode . map e2e
++b64Decode = map e2e . fromJust . B64.decode . map e2e
+ 
+ atomEscaper = mkXmlEscaper [('<', "lt"), ('>', "gt"), ('&', "amp"), ('"', "quot")] (`elem` "<>\"")
+ xEscape :: [Content] -> [Content]
+diff -rN -U3 old-pg_haskellnet/Text/RSS.hs new-pg_haskellnet/Text/RSS.hs
+--- old-pg_haskellnet/Text/RSS.hs	2008-04-22 19:21:58.000000000 +0200
++++ new-pg_haskellnet/Text/RSS.hs	2008-04-22 19:21:58.000000000 +0200
+@@ -26,6 +26,7 @@
+ import Data.Record
+ import Data.List (isPrefixOf)
+ import Data.Maybe
++import Data.Time.Format (formatTime)
+ import Data.Time.Calendar (fromGregorian)
+ import Data.Time.LocalTime
+ import System.Locale (defaultTimeLocale)
+