From 3efb3c04b80206d986b51767e6b879119d219e42 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Nov 2023 23:10:12 +0000 Subject: gentoo auto-resync : 20:11:2023 - 23:10:12 --- dev-haskell/Manifest.gz | Bin 83632 -> 83640 bytes dev-haskell/cabal-install/Manifest | 1 - .../files/cabal-install-0.13.3-nopref.patch | 20 -------- dev-haskell/fgl/Manifest | 1 - dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch | 42 ----------------- dev-haskell/http2/Manifest | 2 - .../http2/files/http2-1.6.0-even-less-deps.patch | 18 ------- .../http2/files/http2-1.6.0-less-deps.patch | 52 --------------------- 8 files changed, 136 deletions(-) delete mode 100644 dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch delete mode 100644 dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch delete mode 100644 dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch delete mode 100644 dev-haskell/http2/files/http2-1.6.0-less-deps.patch (limited to 'dev-haskell') diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz index a68bb3344b7f..03eb3e82d98e 100644 Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest index 3dc3dab18785..ecdf2ff6313d 100644 --- a/dev-haskell/cabal-install/Manifest +++ b/dev-haskell/cabal-install/Manifest @@ -1,4 +1,3 @@ -AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5 DIST cabal-install-3.4.1.0-rev2.cabal 16912 BLAKE2B 9844dca8c72e39cf6f81267f9eae07d25eea9ba351d4ec70026ad0d9a6fb15423b066f2d998e1b702bd9acc15f9f0f90a3a4fc4b4d359bf2c4f5748a77c352ae SHA512 287f819c47a4c1b85ce35c18a299ba18bb0907662a2a5980ed84aebbee93b558ba1237c07100175e44c6b85bcd4953b39691219afb119a8a7d1b6d8aede96d1b DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db DIST cabal-install-3.6.2.0-rev2.cabal 13012 BLAKE2B 06f2bd2876d97560abf7693faf0aa0648a685bea5a443fd517d32236db8dc22c100f672ec79b6e131acd441a91f8e139c46d8a1890f2656d8f2b74be57545b71 SHA512 f6422bd69ff798ac42d1b10790347bffef6e3fc3bfc8fc4be96b6ea990f77199eb388306e45810990fd090d7d7040d72c94f3d65dc6f2f69994bf6a18b4ef134 diff --git a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch deleted file mode 100644 index c36582680a56..000000000000 --- a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs -index 48d8d49..3a38ee1 100644 ---- a/Distribution/Client/IndexUtils.hs -+++ b/Distribution/Client/IndexUtils.hs -@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of - - extractPrefs :: Tar.Entry -> Maybe [Dependency] - extractPrefs entry = case Tar.entryContent entry of -+{- -+ -- get rid of hackage's preferred-versions -+ -- I'd like to have bleeding-edge packages in system and I don't fear of -+ -- broken packages with improper depends - Tar.NormalFile content _ - | takeFileName (Tar.entryPath entry) == "preferred-versions" - -> Just . parsePreferredVersions - . BS.Char8.unpack $ content -+-} - _ -> Nothing - - parsePreferredVersions :: String -> [Dependency] diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest index a776bfb618c4..4a2af554bc24 100644 --- a/dev-haskell/fgl/Manifest +++ b/dev-haskell/fgl/Manifest @@ -1,4 +1,3 @@ -AUX fgl-5.6.0.0-ghc-8.6.patch 1089 BLAKE2B 749a7b99b9d0fa4dfac76bf0666e741741c6da4c8e7d26e2481d2cca29c2198b41cdb3c4f0f2a60183c7a7ef9024fb723748c7433238a6e678ffc715b2ff12f5 SHA512 4e9ca70d5e0c2f5b61fe3eb81a43f48e28fd8796c8e84aa353b5ee1cdc17a5383ac59e7ea2663033645562ecd23335a63be3bd5c05bf5b47119774457c34b411 DIST fgl-5.7.0.3.tar.gz 56415 BLAKE2B 6b7f5d3d2fd93494f3c2f9fbf69dd38c0358ced8a4f488f31d4904a375e21b4d12b974fe78868be8184a989b43fa6f345ca84ed74ea8c5970416c2903dd7a024 SHA512 f77ee1a66fe02b0a01e70b6fcb16baaba67be5433e4310bfb0862cec66855fc0413de586ca111e2e1569898b890fe93faf7c9f079dc569ca2d32b6c087762bbd DIST fgl-5.8.1.1.tar.gz 56829 BLAKE2B ad698d62e0961ebc19800225128053eae5d559a952504025f76c783392e699605abf009eccb7a69b8084009309a9252a29d3efb2b022941de895f7ce2064c610 SHA512 c1d82f2cbce89bb8088dda0e57a6787de0f83834b44f3b7e88393fa79f706dc7b5bff254ee4f2479a90c35a99cedc12c1691770c7c78c48362322b48b02b4873 EBUILD fgl-5.7.0.3.ebuild 723 BLAKE2B 7751f079689ed0c703fc77269aa52cd1ce6d68ff7997faa982c39d18a1f39c2bf59188fb75a6cb0d207eec396c3629eeda458d88c7f6bbad6e913b8492dcb7a6 SHA512 b13b91d0ee0378dc984d3da8c8b3f462b034525d5a5d734c8aa1c2e71377ddb0c93b901d12f28072c406dc7426741a4614b6924cfd6d0ee9810a46894457241d diff --git a/dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch b/dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch deleted file mode 100644 index 0e3f35425ee1..000000000000 --- a/dev-haskell/fgl/files/fgl-5.6.0.0-ghc-8.6.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 344a7e452630ace0f5c647e525e0299d99de5902 -Author: Alex Washburn -Date: Mon Aug 20 23:46:32 2018 -0400 - - Fixing issue with MonadFailDesugaring. - -diff --git a/Data/Graph/Inductive/Monad.hs b/Data/Graph/Inductive/Monad.hs -index 1d58af0..d63752b 100644 ---- a/Data/Graph/Inductive/Monad.hs -+++ b/Data/Graph/Inductive/Monad.hs -@@ -1,4 +1,4 @@ --{-# LANGUAGE MultiParamTypeClasses #-} -+{-# LANGUAGE CPP, MultiParamTypeClasses #-} - - -- (c) 2002 by Martin Erwig [see file COPYRIGHT] - -- | Monadic Graphs -@@ -19,6 +19,10 @@ module Data.Graph.Inductive.Monad( - - - import Data.Graph.Inductive.Graph -+#if MIN_VERSION_base(4,12,0) -+import Control.Monad.Fail -+import Prelude hiding (fail) -+#endif - - {-# ANN module "HLint: ignore Redundant lambda" #-} - -@@ -39,7 +43,13 @@ import Data.Graph.Inductive.Graph - - -- Monadic Graph - -- --class (Monad m) => GraphM m gr where -+class -+#if MIN_VERSION_base(4,12,0) -+ (MonadFail m) -+#else -+ (Monad m) -+#endif -+ => GraphM m gr where - {-# MINIMAL emptyM, isEmptyM, matchM, mkGraphM, labNodesM #-} - - emptyM :: m (gr a b) diff --git a/dev-haskell/http2/Manifest b/dev-haskell/http2/Manifest index d154872ba90d..72d5bb0a073d 100644 --- a/dev-haskell/http2/Manifest +++ b/dev-haskell/http2/Manifest @@ -1,5 +1,3 @@ -AUX http2-1.6.0-even-less-deps.patch 527 BLAKE2B 0a86191247c3b88b6fb188dfb9a963a24c3ddecc2d4eb55fb6e097ed95a023fe7f211c152748f92ea14fff53d467dbd3ddc64520a9663f36f4e514ce30c854fb SHA512 665ff2ac35b518525d15f4f2f15d717e93cfb08fc723f6a909c481d94dfae80cf45f7cf4f828ea49b39802d8ef5559488f30027236109af0fb493107cac65273 -AUX http2-1.6.0-less-deps.patch 1584 BLAKE2B c4411d643e1dd44cd82373750d998b42f6ccb268b0864b4cd3be7be2e9b2262490f80fc3ba204cb7dc9e9aba4a0630102337b6e3090aba88e1ad68e516c29fb9 SHA512 6e626f5412e6e49462d3676e44f410e280e0f0c1b4458d9e400ad6c193620a4b939fd0e80517c503e16c68610c42429fd89761ea7ac88f8c124a7bdc62c61371 DIST http2-3.0.1.tar.gz 5556373 BLAKE2B 40daf73f0460ce649d6bed41b9df961b7388f7ac2e67a11aae56be2f31209183e68cef558b7880b87d1a752f96f989779e5ecbf1a86df5bd4ac8443cd476c41b SHA512 aaa32209fb9945cc33c557866acb053df403bbe37c2bd024ac52e7fc6a3e816d0249e48b83e8846017fe0df0998327cf3498f1bc96b57b0fa81ce9c4d35589c6 DIST http2-4.1.2.tar.gz 5496723 BLAKE2B 1939a137ce0ef3fad476721fe9059963de7b96e9e09c49735d33de3bb4382ec5536c17965677df3482edb09b93e83edee485503d989b07bff8cf7d0c76f48b3e SHA512 85fb0025854c059d186dd4cefffb1065f0c87d494740afba6a3f785c7d579bc11e2ba881eeeae8f682e55902e70a8ba8bc571f84aa27fcaf341110fb70e1b43d EBUILD http2-3.0.1.ebuild 1397 BLAKE2B 3f1abc19a84f35324b944bd78974f9e4d8e29a14558906707f8e3ce3e7e6f1c46bc13cfaa4b308cd2b49a143ef733c1b47aa43cd4a686e4112d1f425d80e39ea SHA512 3fdc0e961a6a632e5ad8b6afed2ffb7b5f6ab4e499be4ec9ee4db105e902e7a6738c4370538d3db7f4bd603b2b50fd43710097c754466fe6ae01e6e08b7e7744 diff --git a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch deleted file mode 100644 index 07be024ee5e1..000000000000 --- a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/http2.cabal b/http2.cabal -index fe57a48..b28ad06 100644 ---- a/http2.cabal -+++ b/http2.cabal -@@ -204,6 +204,3 @@ Executable hpack-debug - Buildable: True -- else -- Buildable: False -- Main-Is: hpack-debug.hs -- Build-Depends: base >= 4 && < 5 -+ Build-Depends: base >= 4 && < 5 - , aeson -@@ -219,2 +216,5 @@ Executable hpack-debug - , word8 -+ else -+ Buildable: False -+ Main-Is: hpack-debug.hs - diff --git a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-less-deps.patch deleted file mode 100644 index 1ee62446d328..000000000000 --- a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/http2.cabal b/http2.cabal -index 7986d1c..fe57a48 100644 ---- a/http2.cabal -+++ b/http2.cabal -@@ -180,7 +180,3 @@ Executable hpack-encode - Buildable: True -- else -- Buildable: False -- Main-Is: hpack-encode.hs -- Other-Modules: HPACKEncode -- Build-Depends: base >= 4 && < 5 -+ Build-Depends: base >= 4 && < 5 - , aeson -@@ -197,2 +193,6 @@ Executable hpack-encode - , word8 -+ else -+ Buildable: False -+ Main-Is: hpack-encode.hs -+ Other-Modules: HPACKEncode - -@@ -226,6 +226,3 @@ Executable hpack-stat - Buildable: True -- else -- Buildable: False -- Main-Is: hpack-stat.hs -- Build-Depends: base >= 4 && < 5 -+ Build-Depends: base >= 4 && < 5 - , aeson -@@ -243,2 +240,5 @@ Executable hpack-stat - , word8 -+ else -+ Buildable: False -+ Main-Is: hpack-stat.hs - -@@ -250,8 +250,3 @@ Executable frame-encode - Buildable: True -- else -- Buildable: False -- Main-Is: frame-encode.hs -- Other-Modules: Case -- JSON -- Build-Depends: base >= 4 && < 5 -+ Build-Depends: base >= 4 && < 5 - , aeson -@@ -263,2 +258,7 @@ Executable frame-encode - , unordered-containers -+ else -+ Buildable: False -+ Main-Is: frame-encode.hs -+ Other-Modules: Case -+ JSON - -- cgit v1.2.3