[Git][haskell-team/DHG_packages][master] 3 commits: hoogle: Upgrading from 5.0.18.3 to 5.0.18.4
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Fri Oct 11 11:18:25 BST 2024
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
91abeb4c by Ilias Tsitsimpis at 2024-10-11T12:59:48+03:00
hoogle: Upgrading from 5.0.18.3 to 5.0.18.4
- - - - -
0418c3e1 by Ilias Tsitsimpis at 2024-10-11T13:03:20+03:00
http-conduit: Upgrading from 2.3.8.1 to 2.3.9
- - - - -
2f14cad0 by Ilias Tsitsimpis at 2024-10-11T13:09:08+03:00
http-client-restricted: Upgrading from 0.0.5 to 0.1.0
- - - - -
11 changed files:
- p/haskell-hoogle/debian/changelog
- p/haskell-hoogle/debian/control
- − p/haskell-hoogle/debian/patches/339-revert.patch
- p/haskell-hoogle/debian/patches/series
- p/haskell-http-client-restricted/debian/changelog
- p/haskell-http-client-restricted/debian/control
- p/haskell-http-client-restricted/debian/patches/remove-AI_ADDRCONFIG
- p/haskell-http-conduit/debian/changelog
- p/haskell-http-conduit/debian/control
- − p/haskell-http-conduit/debian/patches/fix-testsuite
- − p/haskell-http-conduit/debian/patches/series
Changes:
=====================================
p/haskell-hoogle/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-hoogle (5.0.18.3+dfsg1-6) UNRELEASED; urgency=medium
+haskell-hoogle (5.0.18.4+dfsg1-1) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * New upstream release
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:17:34 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 11 Oct 2024 12:55:30 +0300
haskell-hoogle (5.0.18.3+dfsg1-5) unstable; urgency=medium
=====================================
p/haskell-hoogle/debian/control
=====================================
@@ -25,8 +25,8 @@ Build-Depends: debhelper (>= 10),
libghc-conduit-prof,
libghc-conduit-extra-dev (>= 1.2.3.2),
libghc-conduit-extra-prof,
- libghc-connection-dev,
- libghc-connection-prof,
+ libghc-crypton-connection-dev,
+ libghc-crypton-connection-prof,
libghc-extra-dev (>= 1.6.6),
libghc-extra-prof,
libghc-foundation-dev (>= 0.0.13),
@@ -52,6 +52,8 @@ Build-Depends: debhelper (>= 10),
libghc-process-extras-prof,
libghc-resourcet-dev,
libghc-resourcet-prof,
+ libghc-safe-dev (>= 0.3.20),
+ libghc-safe-prof,
libghc-storable-tuple-dev,
libghc-storable-tuple-prof,
libghc-tar-dev,
@@ -80,7 +82,7 @@ Build-Depends-Indep: ghc-doc,
libghc-cmdargs-doc,
libghc-conduit-doc,
libghc-conduit-extra-doc,
- libghc-connection-doc,
+ libghc-crypton-connection-doc,
libghc-extra-doc,
libghc-foundation-doc,
libghc-hashable-doc,
@@ -93,6 +95,7 @@ Build-Depends-Indep: ghc-doc,
libghc-old-locale-doc,
libghc-process-extras-doc,
libghc-resourcet-doc,
+ libghc-safe-doc,
libghc-storable-tuple-doc,
libghc-tar-doc,
libghc-uniplate-doc,
=====================================
p/haskell-hoogle/debian/patches/339-revert.patch deleted
=====================================
@@ -1,65 +0,0 @@
-Description: Revert https://github.com/ndmitchell/hoogle/pull/339/files to possibly fix https://github.com/ndmitchell/hoogle/issues/359
-
---- haskell-hoogle-5.0.18.1+dfsg1.orig/src/Output/Types.hs
-+++ haskell-hoogle-5.0.18.1+dfsg1/src/Output/Types.hs
-@@ -128,15 +128,11 @@ searchFingerprintsDebug store query answ
-
- data TypesNames a where TypesNames :: TypesNames (BStr0, V.Vector Name) deriving Typeable
-
---- At around 7000 packages, Word16 becomes insufficient
---- because there are more than 2^16 Names, so we use Word32.
--type NameWord = Word32
--
- -- Must be a unique Name per String.
- -- First 0-99 are variables, rest are constructors.
- -- More popular type constructors have higher numbers.
- -- There are currently about 14K names, so about 25% of the bit patterns are taken
--newtype Name = Name NameWord deriving (Eq,Ord,Show,Data,Typeable,Storable,Binary)
-+newtype Name = Name Word16 deriving (Eq,Ord,Show,Data,Typeable,Storable,Binary)
-
- name0 = Name 0 -- use to represent _
-
-@@ -154,7 +150,7 @@ prettyName x@(Name i)
- -- | Give a name a popularity, where 0 is least popular, 1 is most popular
- popularityName :: Name -> Double
- popularityName (Name n) | isVar $ Name n = error "Can't call popularityName on a Var"
-- | otherwise = fromIntegral (n - 100) / fromIntegral (maxBound - 100 :: NameWord)
-+ | otherwise = fromIntegral (n - 100) / fromIntegral (maxBound - 100 :: Word16)
-
- newtype Names = Names {lookupName :: Str -> Maybe Name}
-
-@@ -194,10 +190,10 @@ spreadNames [] = []
- spreadNames (sortOn (negate . snd) -> xs@((_,limit):_)) = check $ f (99 + fromIntegral (length xs)) maxBound xs
- where
- check xs | all (isCon . snd) xs && length (nubOrd $ map snd xs) == length xs = xs
-- | otherwise = error $ "Invalid spreadNames, length=" ++ show (length xs)
-+ | otherwise = error "Invalid spreadNames"
-
- -- I can only assign values between mn and mx inclusive
-- f :: NameWord -> NameWord -> [(a, Int)] -> [(a, Name)]
-+ f :: Word16 -> Word16 -> [(a, Int)] -> [(a, Name)]
- f !mn !mx [] = []
- f mn mx ((a,i):xs) = (a, Name real) : f (mn-1) (real-1) xs
- where real = fromIntegral $ max mn $ min mx ideal
-@@ -266,16 +262,14 @@ fpRaresFold :: (b -> b -> b) -> (Name ->
- fpRaresFold g f Fingerprint{..} = f fpRare1 `g` f fpRare2 `g` f fpRare3
-
- instance Storable Fingerprint where
-- sizeOf _ = 3*sizeOf name0 + 2
-+ sizeOf _ = 64
- alignment _ = 4
- peekByteOff ptr i = Fingerprint
-- <$> peekByteOff ptr (i+0) <*> peekByteOff ptr (i+1*w) <*> peekByteOff ptr (i+2*w)
-- <*> peekByteOff ptr (i+3*w) <*> peekByteOff ptr (i+3*w + 1)
-- where w = sizeOf name0
-+ <$> peekByteOff ptr (i+0) <*> peekByteOff ptr (i+2) <*> peekByteOff ptr (i+4)
-+ <*> peekByteOff ptr (i+6) <*> peekByteOff ptr (i+7)
- pokeByteOff ptr i Fingerprint{..} = do
-- pokeByteOff ptr (i+0) fpRare1 >> pokeByteOff ptr (i+1*w) fpRare2 >> pokeByteOff ptr (i+2*w) fpRare3
-- pokeByteOff ptr (i+3*w) fpArity >> pokeByteOff ptr (i+3*w + 1) fpTerms
-- where w = sizeOf name0
-+ pokeByteOff ptr (i+0) fpRare1 >> pokeByteOff ptr (i+2) fpRare2 >> pokeByteOff ptr (i+4) fpRare3
-+ pokeByteOff ptr (i+6) fpArity >> pokeByteOff ptr (i+7) fpTerms
-
- toFingerprint :: Sig Name -> Fingerprint
- toFingerprint sig = Fingerprint{..}
=====================================
p/haskell-hoogle/debian/patches/series
=====================================
@@ -1,3 +1,2 @@
global_database
remove_embedded_copies
-339-revert.patch
=====================================
p/haskell-http-client-restricted/debian/changelog
=====================================
@@ -1,4 +1,4 @@
-haskell-http-client-restricted (0.0.5-3) UNRELEASED; urgency=medium
+haskell-http-client-restricted (0.1.0-1) unstable; urgency=medium
[ Sean Whitton ]
* Orphan package.
@@ -7,8 +7,9 @@ haskell-http-client-restricted (0.0.5-3) UNRELEASED; urgency=medium
[ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.7.0
* Set Debian Haskell Group as the maintainer
+ * New upstream release
- -- Sean Whitton <spwhitton at spwhitton.name> Tue, 06 Aug 2024 17:32:09 +0800
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 11 Oct 2024 13:07:36 +0300
haskell-http-client-restricted (0.0.5-2) unstable; urgency=medium
=====================================
p/haskell-http-client-restricted/debian/control
=====================================
@@ -6,9 +6,9 @@ Build-Depends: cdbs,
debhelper (>= 9),
ghc (>= 9.4),
ghc-prof,
- haskell-devscripts-minimal | haskell-devscripts (>= 0.9),
- libghc-connection-dev (>= 0.2.5),
- libghc-connection-prof,
+ haskell-devscripts (>= 0.9),
+ libghc-crypton-connection-dev (>= 0.3.1),
+ libghc-crypton-connection-prof,
libghc-data-default-dev,
libghc-data-default-prof,
libghc-http-client-dev (>= 0.7.11),
@@ -24,7 +24,7 @@ Build-Depends: cdbs,
libghc-utf8-string-dev,
libghc-utf8-string-prof
Build-Depends-Indep: ghc-doc,
- libghc-connection-doc,
+ libghc-crypton-connection-doc,
libghc-data-default-doc,
libghc-http-client-doc,
libghc-http-client-tls-doc,
=====================================
p/haskell-http-client-restricted/debian/patches/remove-AI_ADDRCONFIG
=====================================
@@ -1,3 +1,5 @@
+Index: b/Network/HTTP/Client/Restricted.hs
+===================================================================
--- a/Network/HTTP/Client/Restricted.hs
+++ b/Network/HTTP/Client/Restricted.hs
@@ -178,8 +178,7 @@ restrictProxy cfg base = do
=====================================
p/haskell-http-conduit/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-http-conduit (2.3.8.1-3) UNRELEASED; urgency=medium
+haskell-http-conduit (2.3.9-1) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
+ * New upstream release
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:17:39 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 11 Oct 2024 13:01:55 +0300
haskell-http-conduit (2.3.8.1-2) unstable; urgency=medium
=====================================
p/haskell-http-conduit/debian/control
=====================================
@@ -17,6 +17,8 @@ Build-Depends:
libghc-aeson-prof,
libghc-attoparsec-dev,
libghc-attoparsec-prof,
+ libghc-attoparsec-aeson-dev (>= 2.1),
+ libghc-attoparsec-aeson-prof,
libghc-conduit-dev (>= 1.2),
libghc-conduit-prof,
libghc-conduit-extra-dev (>= 1.1),
@@ -41,6 +43,9 @@ Build-Depends:
libghc-conduit-dev (>= 1.1),
libghc-conduit-extra-dev,
libghc-cookie-dev,
+ libghc-cookie-prof,
+ libghc-crypton-connection-dev,
+ libghc-crypton-connection-prof,
libghc-data-default-class-dev,
libghc-hspec-dev (>= 1.3),
libghc-http-client-dev,
@@ -60,12 +65,12 @@ Build-Depends:
libghc-warp-dev (<< 3.4),
libghc-warp-prof,
libghc-warp-tls-dev,
- libghc-connection-dev,
netbase,
Build-Depends-Indep:
ghc-doc,
libghc-aeson-doc,
libghc-attoparsec-doc,
+ libghc-attoparsec-aeson-doc,
libghc-conduit-doc,
libghc-conduit-extra-doc,
libghc-http-client-doc,
=====================================
p/haskell-http-conduit/debian/patches/fix-testsuite deleted
=====================================
@@ -1,10 +0,0 @@
---- a/http-conduit.cabal
-+++ b/http-conduit.cabal
-@@ -62,6 +62,7 @@ test-suite test
- build-depends: base >= 4 && < 5
- , HUnit
- , hspec >= 1.3
-+ , connection
- , data-default-class
- , warp-tls
- , tls < 1.5 || >= 1.5.2
=====================================
p/haskell-http-conduit/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-fix-testsuite
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/a86cc6ab656ac11f5781d22151c33107f1da3e98...2f14cad0791a597cbe52fc2ca43728f5b31daac0
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/a86cc6ab656ac11f5781d22151c33107f1da3e98...2f14cad0791a597cbe52fc2ca43728f5b31daac0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20241011/4c6851b9/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list