summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergeiTrofimovich <>2012-02-05 11:21:46 (GMT)
committerhdiff <hdiff@luite.com>2012-02-05 11:21:46 (GMT)
commitc5fdbffe6d7678363784ea6dd826b7f40ab12049 (patch)
tree4036764e8f79ca85bbc1aaa48f4f6dda20cd5285
parent2fc9cad6a21a80484e012762d8a99480efede38e (diff)
version 0.2.150.2.15
-rw-r--r--Cabal2Ebuild.hs8
-rw-r--r--Portage/EBuild.hs2
-rw-r--r--README.rst2
-rw-r--r--cabal/cabal-install/Distribution/Client/Tar.hs2
-rw-r--r--hackport.cabal2
5 files changed, 8 insertions, 8 deletions
diff --git a/Cabal2Ebuild.hs b/Cabal2Ebuild.hs
index d56405f..b5ede28 100644
--- a/Cabal2Ebuild.hs
+++ b/Cabal2Ebuild.hs
@@ -110,16 +110,16 @@ coreLibs = map Cabal.PackageName
,"ghc-prim"
,"haskell98"
,"hpc" --has ebuild, but only in the overlay
- ,"integer"
+ ,"integer" -- up to ghc-6.10
+ ,"integer-gmp" -- ghc-6.12+
,"old-locale"
,"old-time"
,"packedstring"
,"pretty"
,"process"
- ,"random"
- ,"readline" --has ebuild, but only in the overlay
+ -- ,"random" -- not a core package since ghc-7.2
,"rts"
-- ,"syb" -- was splitted off from ghc again
,"template-haskell"
- ,"unix" --has ebuild, but only in the overlay
+ ,"unix" -- unsafe to upgrade
]
diff --git a/Portage/EBuild.hs b/Portage/EBuild.hs
index 1a6d058..0817d22 100644
--- a/Portage/EBuild.hs
+++ b/Portage/EBuild.hs
@@ -80,7 +80,7 @@ showEBuild ebuild =
nl.
ss ("# ebuild generated by hackport " ++ hackportVersion ebuild). nl.
nl.
- ss "EAPI=\"3\"". nl.
+ ss "EAPI=4". nl.
nl.
ss "CABAL_FEATURES=". quote' (sepBy " " $ features ebuild). nl.
ss "inherit haskell-cabal". nl.
diff --git a/README.rst b/README.rst
index 80deae4..b834cb0 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ Quick start
$ mkdir ~/overlays
$ cd ~/overlays
- $ git clone git clone git://github.com/gentoo-haskell/gentoo-haskell.git
+ $ git clone git://github.com/gentoo-haskell/gentoo-haskell.git
$ cd gentoo-haskell
$ hackport update
$ ls -1 .hackport/
diff --git a/cabal/cabal-install/Distribution/Client/Tar.hs b/cabal/cabal-install/Distribution/Client/Tar.hs
index 7063292..6a0c2ad 100644
--- a/cabal/cabal-install/Distribution/Client/Tar.hs
+++ b/cabal/cabal-install/Distribution/Client/Tar.hs
@@ -743,7 +743,7 @@ putString :: FieldWidth -> String -> String
putString n s = take n s ++ fill (n - length s) '\NUL'
--TODO: check integer widths, eg for large file sizes
-putOct :: Integral a => FieldWidth -> a -> String
+putOct :: (Integral a, Show a) => FieldWidth -> a -> String
putOct n x =
let octStr = take (n-1) $ showOct x ""
in fill (n - length octStr - 1) '0'
diff --git a/hackport.cabal b/hackport.cabal
index 78e27a9..06f7da4 100644
--- a/hackport.cabal
+++ b/hackport.cabal
@@ -1,5 +1,5 @@
Name: hackport
-Version: 0.2.14
+Version: 0.2.15
License: GPL
License-file: LICENSE
Author: Henning G√ľnther, Duncan Coutts, Lennart Kolmodin