Skip to content

Commit c084f14

Browse files
committed
ixset, vacuum [ci skip]
1 parent bb0be51 commit c084f14

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

Cabal/Distribution/PackageDescription/Parsec/Legacy.hs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,22 @@ patches = Map.fromList
6868
(Fingerprint 18274748422558568404 4043538769550834851)
6969
(Fingerprint 11395257416101232635 4303318131190196308)
7070
(bsReplace " default- extensions:" "unknown-section")
71+
-- http://hackage.haskell.org/package/vacuum-opengl-0.0
72+
-- \DEL character
73+
, mk "Name: vacuum-opengl\nVersion: 0.0\nSynopsis: Visualize live Haskell data structures using vacuum, graphviz and OpenGL.\nDescription: \DELVisualize live Haskell data structures using vacuum, graphviz and OpenGL.\n "
74+
(Fingerprint 5946760521961682577 16933361639326309422)
75+
(Fingerprint 14034745101467101555 14024175957788447824)
76+
(bsRemove "\DEL")
77+
, mk "Name: vacuum-opengl\nVersion: 0.0.1\nSynopsis: Visualize live Haskell data structures using vacuum, graphviz and OpenGL.\nDescription: \DELVisualize live Haskell data structures using vacuum, graphviz and OpenGL.\n "
78+
(Fingerprint 10790950110330119503 1309560249972452700)
79+
(Fingerprint 1565743557025952928 13645502325715033593)
80+
(bsRemove "\DEL")
81+
-- http://hackage.haskell.org/package/ixset-1.0.4
82+
-- {- comments -}
83+
, mk "Name: ixset\nVersion: 1.0.4\nSynopsis: Efficient relational queries on Haskell sets.\nDescription:\n Create and query sets that are indexed by multiple indices.\nLicense: BSD3\nLicense-file: COPYING\nAut"
84+
(Fingerprint 11886092342440414185 4150518943472101551)
85+
(Fingerprint 5731367240051983879 17473925006273577821)
86+
(bsRemoveStarting "{-")
7187
]
7288
where
7389
mk a b c d = ((a, b), (c, d))
@@ -109,3 +125,9 @@ bsReplace
109125
-> BS.ByteString -> BS.ByteString
110126
bsReplace needle repl haystack = case BS.breakSubstring needle haystack of
111127
(h, t) -> BS.append h (BS.append repl (BS.drop (BS.length needle) t))
128+
129+
bsRemoveStarting
130+
:: BS.ByteString -- ^ needle
131+
-> BS.ByteString -> BS.ByteString
132+
bsRemoveStarting needle haystack = case BS.breakSubstring needle haystack of
133+
(h, _) -> h

Cabal/tests/ParserHackageTests.hs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,14 @@ problematicFiles =
182182
, eq "phasechange/0.1/phasechange.cabal"
183183
, eq "shelltestrunner/1.3/shelltestrunner.cabal"
184184
, eq "smartword/0.0.0.5/smartword.cabal"
185-
-- \DEL
186-
, eq "vacuum-opengl/0.0/vacuum-opengl.cabal"
187-
, eq "vacuum-opengl/0.0.1/vacuum-opengl.cabal"
188185
-- dashes in version, not even tag
189186
, isPrefixOf "free-theorems-webui/"
190-
-- {- comment -}
191-
, eq "ixset/1.0.4/ixset.cabal"
192187
-- comments in braces
193188
, isPrefixOf "hint/"
189+
-- {- comment -}
190+
-- contents in braces are parsed as contents of the field with ReadP
191+
-- that's not what we want
192+
, eq "ixset/1.0.4/ixset.cabal"
194193
]
195194
where
196195
eq = (==)

0 commit comments

Comments
 (0)