summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergeiTrofimovich <>2014-09-26 21:25:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2014-09-26 21:25:00 (GMT)
commitde64ca6e40ce1a0375855e4e7abc419618d41d1e (patch)
tree3cfbdd8a6975501e87a43c059a8fdfbd60af7e57
parent94da4988758c48ed41b1f7a50eb484b775f3768a (diff)
version 0.4.40.4.4
-rw-r--r--AnsiColor.hs34
-rw-r--r--Merge/Dependencies.hs3
-rw-r--r--Portage/Dependency/Normalize.hs7
-rw-r--r--hackport.cabal6
4 files changed, 19 insertions, 31 deletions
diff --git a/AnsiColor.hs b/AnsiColor.hs
index cca7f49..dfe3e16 100644
--- a/AnsiColor.hs
+++ b/AnsiColor.hs
@@ -6,7 +6,10 @@
-}
module AnsiColor
- where
+ ( Color(..)
+ , bold
+ , inColor
+ ) where
import Data.List
@@ -33,30 +36,11 @@ col fg bf bg = show (fromEnum fg + 30) : bf' [show (fromEnum bg + 40)]
inColor :: Color -> Bool -> Color -> String -> String
inColor c bf bg txt = esc (col c bf bg) ++ txt ++ esc ["00"]
-bold, italic, underline, inverse :: String -> String
-bold = ansi "1" "22"
-italic = ansi "3" "23"
-underline = ansi "4" "24"
-inverse = ansi "7" "27"
+bold :: String -> String
+bold = ansi "1" "22"
+-- italic = ansi "3" "23"
+-- underline = ansi "4" "24"
+-- inverse = ansi "7" "27"
ansi :: String -> String -> String -> String
ansi on off txt = esc [on] ++ txt ++ esc [off]
-
-{-
-data Doc = Doc (Bool -> String -> String)
-
-char chr = Doc (\_ c -> chr:c)
-
-text str = Doc (\_ c -> str ++ c)
-
-(Doc t) <> (Doc u) = Doc (\b c -> t b (u b c))
-
-t <+> u = t <> char ' ' <> u
-
-showDoc (Doc d) b = d b ""
-
-color (Doc d) color = Doc (\ b c ->
- if not b
- then d b c
- else inColor color False Default (d b ""))
--}
diff --git a/Merge/Dependencies.hs b/Merge/Dependencies.hs
index 866ece3..8cc34c8 100644
--- a/Merge/Dependencies.hs
+++ b/Merge/Dependencies.hs
@@ -339,6 +339,8 @@ staticTranslateExtraLib lib = lookup lib m
, ("pgf", any_c_p "media-libs" "libpgf")
, ("ssh2", any_c_p "net-libs" "libssh2")
, ("dl", any_c_p "virtual" "libc")
+ , ("glfw", any_c_p "media-libs" "glfw")
+ , ("nettle", any_c_p "dev-libs" "nettle")
]
---------------------------------------------------------------
@@ -487,4 +489,5 @@ pkgconfig_table =
,("panelw", ("sys-libs", "ncurses", Portage.AnySlot))
,("libssh2", ("net-libs", "libssh2", Portage.AnySlot))
,("SDL_image", ("media-libs", "sdl-image", Portage.AnySlot))
+ ,("libzmq", ("net-libs", "zeromq", Portage.AnySlot))
]
diff --git a/Portage/Dependency/Normalize.hs b/Portage/Dependency/Normalize.hs
index 2b969c4..4a6891f 100644
--- a/Portage/Dependency/Normalize.hs
+++ b/Portage/Dependency/Normalize.hs
@@ -31,10 +31,10 @@ stabilize_pass pass d
normalization_step :: Int -> Dependency -> Dependency
normalization_step level =
id
- . tp "PC2" (stabilize_pass propagate_context)
+ . tp "PC2" (stabilize_pass (tp "PC2 step" propagate_context))
. tp "F3" (stabilize_pass flatten)
. tp "LC" lift_context
- . tp "PC1" (stabilize_pass propagate_context)
+ . tp "PC1" (stabilize_pass (tp "PC1 step" propagate_context))
. tp "F2" (stabilize_pass flatten)
. tp "RD" (stabilize_pass remove_duplicates)
. tp "RE" (stabilize_pass remove_empty)
@@ -243,8 +243,9 @@ propagate_context' ctx d =
| (optimized_d, other_deps) <- slice_list deps
, let ctx' = ctx ++ other_deps
d' = go ctx' optimized_d
+ d'ctx = d' : ctx
v = case d' /= optimized_d of
- True -> Just (d':other_deps)
+ True -> Just (d':map (go d'ctx) other_deps)
False -> Nothing -- haven't managed to optimize anything
] ++ [Just deps] -- unmodified
DependAnyOf deps -> DependAnyOf $ map (go ctx) deps
diff --git a/hackport.cabal b/hackport.cabal
index e165894..87a7fea 100644
--- a/hackport.cabal
+++ b/hackport.cabal
@@ -1,5 +1,5 @@
Name: hackport
-Version: 0.4.3
+Version: 0.4.4
License: GPL
License-file: LICENSE
Author: Henning G√ľnther, Duncan Coutts, Lennart Kolmodin
@@ -29,7 +29,7 @@ Executable hackport
filepath,
parsec,
mtl,
- network,
+ network >= 2.6, network-uri >= 2.6,
pretty,
regex-compat,
MissingH,
@@ -103,7 +103,7 @@ Executable hackport-guess-ghc-version
filepath,
parsec,
mtl,
- network,
+ network >= 2.6, network-uri >= 2.6,
pretty,
regex-compat,
HTTP >= 4000.0.3,