diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-25 08:55:56 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-25 08:55:56 +0100 |
| commit | bf2c6ad6782df5963101bc3e73c0d31d65e0829f (patch) | |
| tree | 576f80a009b285b5cfedf66ecadc7182810684e7 /dev-haskell | |
| parent | aeb34c47a1042b074096bacb85205617c8a14d3a (diff) | |
gentoo auto-resync : 25:07:2022 - 08:55:56
Diffstat (limited to 'dev-haskell')
38 files changed, 82 insertions, 378 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz Binary files differindex 870691300edd..fa8742e8f7cd 100644 --- a/dev-haskell/Manifest.gz +++ b/dev-haskell/Manifest.gz diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest index f4cb61377367..fd94b87397ee 100644 --- a/dev-haskell/aeson/Manifest +++ b/dev-haskell/aeson/Manifest @@ -1,4 +1,3 @@ -AUX aeson-1.5.6.0-fix-tests-ghc_9.patch 9678 BLAKE2B 40512bbb1bbd0d8a80baad69ce70454132bb81aecedcf0011c7466c1eea81871e205af54da9f4aa51abd34ad4a64289f9ae28bdb90433dd07f03111795c54ff2 SHA512 e81925089a7bd43f9aaebaf20633afeb66b59fe5eb3c9e2b2123d5b4e790e5143a9470b0726698cfb6588132fc68296f5b60f0ccbf12bcb23fff3fe20ddbf915 DIST aeson-2.0.3.0-rev1.cabal 5867 BLAKE2B c64638d037ee4599a15c2c2c051b569649f57663312aaebc10c2a47cf2dfd834d03e8e4c909d70874737fd407f46f75744052ebe9319cde8ef56e4676115dbe0 SHA512 54b3ed453d6ec93a73d4bb639132164e1ffa698e87076577da39137ec2bb62b0c1a2f66d9412e1adad97d7d6cc32a6738e0495b0c4d312c183d7a29d01a29784 DIST aeson-2.0.3.0.tar.gz 297283 BLAKE2B e6784fd2081c56d6f2f2fb82b383478ab743fcce77568c430c2b62a79b4ee89901b7e278b1da948215215d50ef72bbdef128fb5dfb6679c92d30586d1406302e SHA512 546adaaf864ca40012a268d71f442479f0ad7c69e9f943391801570e227a2faa652494766f1f63b77c730e019e83ebdd7511426baa12792a28fbb470eca64552 EBUILD aeson-2.0.3.0.ebuild 3185 BLAKE2B 9bf0dcfdb4c766f99f3147315f29468177819b389f9a7ebaba8a06bb31c69f2b13237a0a4bfc7ca14315ef3e1b47cba2cf6813748fbc1b5aaf52925caf1e91b3 SHA512 736b3d9105dd665f2c66c07633c9ea6d6181586906ba43673bc164e2e9d94a46b866720fe2cb55ebf4bc9baed1d02bd11163d12af9cf69ff7bb3cbdd7187842c diff --git a/dev-haskell/aeson/files/aeson-1.5.6.0-fix-tests-ghc_9.patch b/dev-haskell/aeson/files/aeson-1.5.6.0-fix-tests-ghc_9.patch deleted file mode 100644 index bf6f2eb92c1e..000000000000 --- a/dev-haskell/aeson/files/aeson-1.5.6.0-fix-tests-ghc_9.patch +++ /dev/null @@ -1,232 +0,0 @@ -From 083691aa10e802a1b9b57922f3d0a234cafdb90d Mon Sep 17 00:00:00 2001 -From: Oleg Grenrus <oleg.grenrus@iki.fi> -Date: Sat, 20 Feb 2021 23:15:41 +0200 -Subject: [PATCH] Add GHC-9.0.1 CI job - -Not for benchmarks yet though, cassava etc need bounds relaxed first - -We need to reorder stuff in UnitTests, GHC-9.0 is stricter about -which instances are visible. ---- - aeson.cabal | 2 +- - tests/UnitTests.hs | 144 ++++++++++---------- - -diff --git a/aeson.cabal b/aeson.cabal -index 91eacd7d..6152e509 100644 ---- a/aeson.cabal -+++ b/aeson.cabal -@@ -8,7 +8,7 @@ copyright: (c) 2011-2016 Bryan O'Sullivan - author: Bryan O'Sullivan <bos@serpentine.com> - maintainer: Adam Bergmark <adam@bergmark.nl> - stability: experimental --tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.1 -+tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.4, GHC == 9.0.1 - synopsis: Fast JSON parsing and encoding - cabal-version: >= 1.10 - homepage: https://github.com/haskell/aeson - -diff --git a/tests/UnitTests.hs b/tests/UnitTests.hs -index a0651dda..e5c73f46 100644 ---- a/tests/UnitTests.hs -+++ b/tests/UnitTests.hs -@@ -76,59 +76,7 @@ import qualified SerializationFormatSpec - import Data.Aeson.Parser.UnescapeFFI () - import Data.Aeson.Parser.UnescapePure () - --tests :: TestTree --tests = testGroup "unit" [ -- testGroup "SerializationFormatSpec" SerializationFormatSpec.tests -- , testGroup "ErrorMessages" ErrorMessages.tests -- , testGroup "camelCase" [ -- testCase "camelTo" $ roundTripCamel "aName" -- , testCase "camelTo" $ roundTripCamel "another" -- , testCase "camelTo" $ roundTripCamel "someOtherName" -- , testCase "camelTo" $ -- assertEqual "" "camel_apicase" (camelTo '_' "CamelAPICase") -- , testCase "camelTo2" $ roundTripCamel2 "aName" -- , testCase "camelTo2" $ roundTripCamel2 "another" -- , testCase "camelTo2" $ roundTripCamel2 "someOtherName" -- , testCase "camelTo2" $ -- assertEqual "" "camel_api_case" (camelTo2 '_' "CamelAPICase") -- ] -- , testGroup "encoding" [ -- testCase "goodProducer" goodProducer -- ] -- , testGroup "utctime" [ -- testCase "good" utcTimeGood -- , testCase "bad" utcTimeBad -- ] -- , testGroup "formatError" [ -- testCase "example 1" formatErrorExample -- ] -- , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark -- , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws -- , testGroup "Object construction" $ fmap (testCase "-") objectConstruction -- , testGroup "Issue #351" $ fmap (testCase "-") issue351 -- , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors -- , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions -- , testCase "PR #455" pr455 -- , testCase "Unescape string (PR #477)" unescapeString -- , testCase "Show Options" showOptions -- , testGroup "SingleMaybeField" singleMaybeField -- , testCase "withEmbeddedJSON" withEmbeddedJSONTest -- , testCase "SingleFieldCon" singleFieldCon -- , testGroup "UnknownFields" unknownFields -- , testGroup "Ordering of object keys" keyOrdering -- , testCase "Ratio with denominator 0" ratioDenominator0 -- , testCase "Rational parses number" rationalNumber -- , testCase "Big rational" bigRationalDecoding -- , testCase "Small rational" smallRationalDecoding -- , testCase "Big scientific exponent" bigScientificExponent -- , testCase "Big integer decoding" bigIntegerDecoding -- , testCase "Big natural decading" bigNaturalDecoding -- , testCase "Big integer key decoding" bigIntegerKeyDecoding -- , testGroup "QQ.Simple" -- [ testCase "example" $ -- assertEqual "" (object ["foo" .= True]) [aesonQQ| {"foo": true } |] -- ] -- ] -+ - - roundTripCamel :: String -> Assertion - roundTripCamel name = assertEqual "" name (camelFrom '_' $ camelTo '_' name) -@@ -389,11 +337,7 @@ issue351 = [ - -- Comparison between bytestring and text encoders - ------------------------------------------------------------------------------ - --ioTests :: IO [TestTree] --ioTests = do -- enc <- encoderComparisonTests -- js <- jsonTestSuite -- return [enc, js] -+ - - encoderComparisonTests :: IO TestTree - encoderComparisonTests = do -@@ -427,6 +371,7 @@ encoderComparisonTests = do - - -- A regression test for: https://github.com/bos/aeson/issues/293 - data MyRecord = MyRecord {_field1 :: Maybe Int, _field2 :: Maybe Bool} -+deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord - - data MyRecord2 = MyRecord2 {_field3 :: Maybe Int, _field4 :: Maybe Bool} - deriving Generic -@@ -522,6 +467,8 @@ _blacklist = HashSet.fromList [ - - -- A regression test for: https://github.com/bos/aeson/pull/455 - data Foo a = FooNil | FooCons (Foo Int) -+deriveToJSON defaultOptions ''Foo -+deriveToJSON1 defaultOptions ''Foo - - pr455 :: Assertion - pr455 = assertEqual "FooCons FooNil" -@@ -548,6 +495,7 @@ showOptions = - - newtype SingleMaybeField = SingleMaybeField { smf :: Maybe Int } - deriving (Eq, Show, Generic) -+deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField - - singleMaybeField :: [TestTree] - singleMaybeField = do -@@ -589,14 +537,21 @@ singleFieldCon = - - newtype UnknownFields = UnknownFields { knownField :: Int } - deriving (Eq, Show, Generic) -+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFields -+ - newtype UnknownFieldsTag = UnknownFieldsTag { tag :: Int } - deriving (Eq, Show, Generic) -+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsTag -+ - newtype UnknownFieldsUnaryTagged = UnknownFieldsUnaryTagged { knownFieldUnaryTagged :: Int } - deriving (Eq, Show, Generic) -+deriveJSON defaultOptions{tagSingleConstructors=True,rejectUnknownFields=True} ''UnknownFieldsUnaryTagged -+ - data UnknownFieldsSum - = UnknownFields1 { knownField1 :: Int } - | UnknownFields2 { knownField2 :: Int } - deriving (Eq, Show, Generic) -+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsSum - - unknownFields :: [TestTree] - unknownFields = concat -@@ -753,17 +708,68 @@ bigNaturalKeyDecoding = - type family Fam757 :: * -> * - type instance Fam757 = Maybe - newtype Newtype757 a = MkNewtype757 (Fam757 a) -+deriveToJSON1 defaultOptions ''Newtype757 - --deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord -- --deriveToJSON defaultOptions ''Foo --deriveToJSON1 defaultOptions ''Foo -- --deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField -+------------------------------------------------------------------------------- -+-- Tests trees -+------------------------------------------------------------------------------- - --deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFields --deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsTag --deriveJSON defaultOptions{tagSingleConstructors=True,rejectUnknownFields=True} ''UnknownFieldsUnaryTagged --deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsSum -+ioTests :: IO [TestTree] -+ioTests = do -+ enc <- encoderComparisonTests -+ js <- jsonTestSuite -+ return [enc, js] - --deriveToJSON1 defaultOptions ''Newtype757 -+tests :: TestTree -+tests = testGroup "unit" [ -+ testGroup "SerializationFormatSpec" SerializationFormatSpec.tests -+ , testGroup "ErrorMessages" ErrorMessages.tests -+ , testGroup "camelCase" [ -+ testCase "camelTo" $ roundTripCamel "aName" -+ , testCase "camelTo" $ roundTripCamel "another" -+ , testCase "camelTo" $ roundTripCamel "someOtherName" -+ , testCase "camelTo" $ -+ assertEqual "" "camel_apicase" (camelTo '_' "CamelAPICase") -+ , testCase "camelTo2" $ roundTripCamel2 "aName" -+ , testCase "camelTo2" $ roundTripCamel2 "another" -+ , testCase "camelTo2" $ roundTripCamel2 "someOtherName" -+ , testCase "camelTo2" $ -+ assertEqual "" "camel_api_case" (camelTo2 '_' "CamelAPICase") -+ ] -+ , testGroup "encoding" [ -+ testCase "goodProducer" goodProducer -+ ] -+ , testGroup "utctime" [ -+ testCase "good" utcTimeGood -+ , testCase "bad" utcTimeBad -+ ] -+ , testGroup "formatError" [ -+ testCase "example 1" formatErrorExample -+ ] -+ , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark -+ , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws -+ , testGroup "Object construction" $ fmap (testCase "-") objectConstruction -+ , testGroup "Issue #351" $ fmap (testCase "-") issue351 -+ , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors -+ , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions -+ , testCase "PR #455" pr455 -+ , testCase "Unescape string (PR #477)" unescapeString -+ , testCase "Show Options" showOptions -+ , testGroup "SingleMaybeField" singleMaybeField -+ , testCase "withEmbeddedJSON" withEmbeddedJSONTest -+ , testCase "SingleFieldCon" singleFieldCon -+ , testGroup "UnknownFields" unknownFields -+ , testGroup "Ordering of object keys" keyOrdering -+ , testCase "Ratio with denominator 0" ratioDenominator0 -+ , testCase "Rational parses number" rationalNumber -+ , testCase "Big rational" bigRationalDecoding -+ , testCase "Small rational" smallRationalDecoding -+ , testCase "Big scientific exponent" bigScientificExponent -+ , testCase "Big integer decoding" bigIntegerDecoding -+ , testCase "Big natural decading" bigNaturalDecoding -+ , testCase "Big integer key decoding" bigIntegerKeyDecoding -+ , testGroup "QQ.Simple" -+ [ testCase "example" $ -+ assertEqual "" (object ["foo" .= True]) [aesonQQ| {"foo": true } |] -+ ] -+ ] diff --git a/dev-haskell/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest index 7f45a61e5812..445426fd8125 100644 --- a/dev-haskell/ansi-terminal/Manifest +++ b/dev-haskell/ansi-terminal/Manifest @@ -1,3 +1,3 @@ DIST ansi-terminal-0.10.3.tar.gz 35863 BLAKE2B 8535a0dcfbf4287abee8c52cd951d155c30b8a2de73a4799ad51e093ff4651fd2bcc771a61627c143f2f48b7cc66e9bb125166be1b13d2d51bcdf1d1666450ee SHA512 231dfaaef2e7b1fb40a0e63bcdce984f914dd0c17af90bc2415c127d503dc438d1952dadfbb524f9ae83d872b30a353d875dda74eb492536cf8953c1e4224187 EBUILD ansi-terminal-0.10.3.ebuild 701 BLAKE2B ee018f2541a82d6c96d661bec36a6b68ad9a3f1cb8cee9368a6652eba9519032e9d45f04ecc72df68a715c04a4119fe5b23ed3c06abc7e35dc0e371a4b36acf9 SHA512 0da8a8cd48f76a7bbc426b9bb9d39a917f229021b770df1b280147fb68d2ba90912fa3e78cf410e7a37a10219f4270f2d6a16c6b4ff284bbb54527e73cb368f5 -MISC metadata.xml 703 BLAKE2B c77e784f55e64324a2d23abb4be6e710863787c23981778c3643ef30419a248e5df8b39f022d6c28460f1fd25bf8bc8d5902fad9a3b83fc5714112b8c2f04ca8 SHA512 57020437e5d37944e292fa9dea9094634b0bc5485c9a4c55060ca5527730af03affd024cc7cd8cf64dc01083e5123c7c384f254f681b24ed34123364c565e223 +MISC metadata.xml 709 BLAKE2B 89ef64414682dd6b48f6ddb628af730959a4401f2e83d4a8ccb4c3f20e152befc28dcf8f61356bd8528b55e59b1fa789f319577a90bf95d1da86fbcb6e53f300 SHA512 d2126b038b4a25a701994ed833fddf0f8bb8f5481d926ff4d1eaa8bb52086002981a653f3aa2cdff11a552b0740502b285c8421716de5ce0388116c7bf6318e5 diff --git a/dev-haskell/ansi-terminal/metadata.xml b/dev-haskell/ansi-terminal/metadata.xml index 496367aa108b..ba5b44f0dc4b 100644 --- a/dev-haskell/ansi-terminal/metadata.xml +++ b/dev-haskell/ansi-terminal/metadata.xml @@ -13,6 +13,6 @@ <flag name="example">Build the example application.</flag> </use> <upstream> - <remote-id type="github">feuerbach/ansi-terminal</remote-id> + <remote-id type="github">UnkindPartition/ansi-terminal</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/base16-bytestring/Manifest b/dev-haskell/base16-bytestring/Manifest index 7b54f5951610..e05896d8f9ac 100644 --- a/dev-haskell/base16-bytestring/Manifest +++ b/dev-haskell/base16-bytestring/Manifest @@ -1,3 +1,3 @@ DIST base16-bytestring-0.1.1.7.tar.gz 5136 BLAKE2B 65fbfb5288cae1cd17d4955c9ec55a40d00cd90556dd6c3923d110988612859e2301f4d9c2317a0b24f6dc1532fbb82b3b53133499c24ba276eb1f6754707a1f SHA512 33c4c1e35489cee42ced9fffed3ee11bfe976dc167adc3ab715c224e69025fd9634cb010ee09bf86aa71170e12172c823964fdc3bed4611c599f686beea2985e EBUILD base16-bytestring-0.1.1.7.ebuild 606 BLAKE2B 5df8b32f8039b2d8a9be440422c2bac2886e725bb5bfa5fc311f779132c45092a9851e2ad1f100269b410d3175706d12b99e6370d1e638d7c0c1cabd4ed5f2d9 SHA512 b7338e5a53bbd5e2408cc67aaeeb50c5df6a8169b1c878d896de52b9002c42d3a8c35c8e40ff386752c5fe3118c2d2e90d53a2ce6994c80e95b5f89ff28dc433 -MISC metadata.xml 336 BLAKE2B 18a1850149e0ef8f34a2f35f2a9c3f5120840d6fec54c752f79ca846143a727f6534bda8f5c43416f4b07a4c9b15821585d1b5dab9302598e3ef7a86fc24bb35 SHA512 ff2fc3ad1320a05d424f70399055b92f6d85187f5b4bf63e58faf345111625f087d1069dc1d67dc192f5dff5804ba52388328005f0d447ee2db6192106072a64 +MISC metadata.xml 340 BLAKE2B 4dc75c7e9bd97bffbae14968dae010c880e92112cebfe3e50e5396de408e9e69cb7a2990b4ccad821aa97309d06c3186f5ad2c8fffc296839917cf8eda738763 SHA512 8ad96b8237c0f87f8f3933f7592beae23ae28b9af95592922f22461962382ba38ade6296582a2cb816a2a975062e2894961faba37d94578eab7d4b9e92fa8279 diff --git a/dev-haskell/base16-bytestring/metadata.xml b/dev-haskell/base16-bytestring/metadata.xml index 1989ef029c5b..6bc8bd630d13 100644 --- a/dev-haskell/base16-bytestring/metadata.xml +++ b/dev-haskell/base16-bytestring/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Haskell</name> </maintainer> <upstream> - <remote-id type="github">bos/base16-bytestring</remote-id> + <remote-id type="github">haskell/base16-bytestring</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest index e3554cf0d756..5871c57a15ec 100644 --- a/dev-haskell/base64-bytestring/Manifest +++ b/dev-haskell/base64-bytestring/Manifest @@ -1,3 +1,3 @@ DIST base64-bytestring-1.0.0.3.tar.gz 10104 BLAKE2B 00dca0236c739704f45991d974b99715c2c903d8ee228b7fbe3524d690496248d8b6acc798e8c42c70d4bc382b9c79f4f54bd2a858d3863207bb93fa44478ab6 SHA512 e4e244752491ac279a88afc4ceb0fe4c44b75fc369ff47ec29e3c99996b4be967051034c94f0c659d47a153d6b9e0b65a75ea419fdfd52fd50cdc0da2dca7db6 EBUILD base64-bytestring-1.0.0.3.ebuild 754 BLAKE2B 35a4cba405eb0c0294b593a8853f88a117955aac7b37e396e1e27360f688eed3f6346de269612b9e114518a2d9f1fe4c190626d275c6e8e1d1ee7e158a40b774 SHA512 5a6e85d32678fe70bb1e0c093b60c7d3c537f5f7ff5f50dfaabfce0596fc58ec7c88b4980ecc882e63038a2ed9babc4947766dbdb905705d43055f8cb6d8e0be -MISC metadata.xml 336 BLAKE2B 6725317946281b2e5b460295baf4a9708fef691005dc68954c7180df1907b642e0c1f19d4939d5bf634a33ff1cc45e8e9503cd95d6109d80de46662581f5915d SHA512 1863689a986f430195cb47020f3983d332fdf012b8fc396a12c7812ee523651b26d785be5ff26612f518ec32a44033e5cefe0326956e515bde6e20a1dacd3690 +MISC metadata.xml 340 BLAKE2B 56e0880b463ce7321963de5e79853ac335d841323ac6dda1d2e38f19da9ecfbc1a877cf1ea954c840be48376ffe2bb22cd419ee427183a4cb2caf047e76fe554 SHA512 29f956e7670b5341a2efa57a44cc6b2ddfbd891fc757822ef0a6873c9d2b816997179565619bdd51f14bab64e67f38338951ffb8578bce4be1aa54e432ce1740 diff --git a/dev-haskell/base64-bytestring/metadata.xml b/dev-haskell/base64-bytestring/metadata.xml index 25fcbe922d4d..d24d1887079b 100644 --- a/dev-haskell/base64-bytestring/metadata.xml +++ b/dev-haskell/base64-bytestring/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Haskell</name> </maintainer> <upstream> - <remote-id type="github">bos/base64-bytestring</remote-id> + <remote-id type="github">haskell/base64-bytestring</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest index 96f87ba36e6b..e58432e09650 100644 --- a/dev-haskell/hackage-security/Manifest +++ b/dev-haskell/hackage-security/Manifest @@ -1,5 +1,3 @@ -AUX hackage-security-0.5.3.0-ghc-8.8.patch 720 BLAKE2B 1761f38642335f28a17d4bb089cf0f0de8acf4b14767e3c5987f723e520000865080c69e29d6a35870f0b5cca44f67371686beb84ff023d73fcd13fbfd89c962 SHA512 d220ea358e59a8b965695006ade99dad369a4648ab77012d0a7e3413d90d37809887f449b9e4831f97d2e871205f3b3d86fa4977ca781eb028993d393f002031 -AUX hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch 602 BLAKE2B 114b64c1e15b260b64ca68b2aadb1b4f462f160ec58cad2669d496083f28757f87474f76f6b8bbf203c80bb75106d16bab451af528f81edbf7a323a290c24cf7 SHA512 0380ed545b38e3a6f8c6b0232be2417a8e54a2f9027551247d3e796a82424cce21e62897a1f55924b757b19c391c5d411495c1e279821b5f6be27fcf57179c85 DIST hackage-security-0.6.1.0.tar.gz 86243 BLAKE2B f28651d9c0506e4e1b9085e1efd6647ad3dd0dea4fcec2823f3072504831e7d01be34f6a14619cc352ef236214a1fd7073449f00c82c8f7ef5e95cdca1ad3133 SHA512 0a303e8c594a5fef52bf95f3ff75379aeec44fdaebc6ba78da8bf7911798040b43c3c289f0c4d7bcd2c1903d82c29d5ffa012360660c3548c0f3fb4b719a9327 EBUILD hackage-security-0.6.1.0.ebuild 2324 BLAKE2B 4b788fcb42e4b375dd7f001f3fde38a080ad8e3f6eaf11c90e4ef13b4632c3fd3ee089b1158e64271115e1d0f556f6fd5b8ba685bdc3b0a6f94e7c370a3f0b97 SHA512 86a65171444ecf1a46d2cac5d5be960e16aac7df6037114e74232669475b14515912e6ed7bd0d624aa71e708324e59b804982795b314a62e0cd982d4e3817b59 MISC metadata.xml 358 BLAKE2B 12d49d372b9d972b090959fa4386cd071450c6c038d3cbe5adc0b2ff5de41de6fc422cc0063382c84dc1a2e188e3eae64e2ce84504587aff452e4fc11d895b2f SHA512 ad8b0b471b64cc9dec807c71d5c2cebea90558a51794c36cff68b30c65e9f8d3f5f965c660a989e1c0a98636c2670926629913ab5b8916524609ceed4a47db91 diff --git a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch deleted file mode 100644 index 7c30961a4b4d..000000000000 --- a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs ---- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs 2018-03-25 19:39:07.000000000 -0400 -+++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs 2019-03-16 08:29:08.347456951 -0400 -@@ -78,7 +78,7 @@ - lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo - lookupM m fp = - case lookup fp m of -- Nothing -> fail $ "No entry for " ++ pretty fp ++ " in filemap" -+ Nothing -> error $ "No entry for " ++ pretty fp ++ " in filemap" - Just nfo -> return nfo - - {------------------------------------------------------------------------------- diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch deleted file mode 100644 index fd83a5113c56..000000000000 --- a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs -index 598e151..f62f1c5 100644 ---- a/tests/TestSuite.hs -+++ b/tests/TestSuite.hs -@@ -70,7 +70,7 @@ tests = testGroup "hackage-security" [ - testProperty "prop_roundtrip_canonical" JSON.prop_roundtrip_canonical - , testProperty "prop_roundtrip_pretty" JSON.prop_roundtrip_pretty - , testProperty "prop_canonical_pretty" JSON.prop_canonical_pretty -- , testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical -+ -- , testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical - ] - ] - diff --git a/dev-haskell/hinotify/Manifest b/dev-haskell/hinotify/Manifest index b88491d00578..58261ae10846 100644 --- a/dev-haskell/hinotify/Manifest +++ b/dev-haskell/hinotify/Manifest @@ -1,3 +1,3 @@ DIST hinotify-0.3.10.tar.gz 9193 BLAKE2B 877f98091412732656913f7af9e29e34088d240ac88214afd237e2994730f119a80db3960f27ad3a024026dcd8bb232853412aa314f416555e27886f87fda64a SHA512 d22f40bb055e14fd4be6669122a11b36fd7c5a989489d1b8c1e4117672b9f1700197a827f23242c91504b8236c349a4494adf724827001a77a1abdc11a9d6b8b -EBUILD hinotify-0.3.10.ebuild 621 BLAKE2B c4a8e975f2b35d29613608daf1678cdbc339d3dec1ba5d5ba87f7c284edc06e1bc77b95318b94324d3a560f4f5652bc12ba01ff67b49bcf5a3c374a2b3f49b99 SHA512 b9beb9774b0ab4035a96e65e44eab94a678800e0ad2259550720d1b27a98bbf078861c72bd91fcb44865bbf283f1f05b6de8000006fea91e9a2acb40c57db7c6 -MISC metadata.xml 314 BLAKE2B e1d6ff151d5a5f22f8913cdf4214a95a05146c9980d3552c5a7597971289d63011afb786201c2cef3fff90956ab0040311b3810aa7ece43ea9b1e041fde96357 SHA512 c8b002af8e4832b48a1cab823ae658c0b8934c253b548758adc3eefb173fc9b17fa62cd2e5cc36d88f512933ca4d036d4292ab5210e6cfb611a9b89da068437a +EBUILD hinotify-0.3.10.ebuild 617 BLAKE2B 605d043a19f50d0b79467a6c1c50f7e1096c130eafc2536b75191e1a4daf2d8d90831f1e65ebd1abb61bcd092e5878b66124360d73452687c251f76f2fe61b72 SHA512 baa3be6c7edd18f659fd4b8fb5b5d13ac7325b8937bbafbbaa55108c0ea47f846778f574874c5b38a060b0dbc6dec9c2715b9dc8b39772953bd65ee9481991db +MISC metadata.xml 310 BLAKE2B cefbe838bbd2e8f6ec19773b16694c9ab15756588b6909466d8b7ff3948a61d3a27eb3e84a71ed74270d8145ca34b7a6a47dd4fab929722bd85c49d5cc6b231a SHA512 2fd3c373b146730465157afabee2a983ef99562ec1e5495f0628aec95e440b59a8beac7b35a5cb43b74ed8232eb5353e03e3888ea1a8bea72288f585e304b399 diff --git a/dev-haskell/hinotify/hinotify-0.3.10.ebuild b/dev-haskell/hinotify/hinotify-0.3.10.ebuild index 7ace9926c30c..41e63a2793ff 100644 --- a/dev-haskell/hinotify/hinotify-0.3.10.ebuild +++ b/dev-haskell/hinotify/hinotify-0.3.10.ebuild @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Haskell binding to inotify" -HOMEPAGE="https://github.com/kolmodin/hinotify.git" +HOMEPAGE="https://github.com/kolmodin/hinotify" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" diff --git a/dev-haskell/hinotify/metadata.xml b/dev-haskell/hinotify/metadata.xml index a6d15f03263f..e9a57e77687b 100644 --- a/dev-haskell/hinotify/metadata.xml +++ b/dev-haskell/hinotify/metadata.xml @@ -5,6 +5,6 @@ <email>haskell@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">kolmodin/hinotify.git</remote-id> + <remote-id type="github">kolmodin/hinotify</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/hspec-expectations/Manifest b/dev-haskell/hspec-expectations/Manifest index 0f8ba89dabc9..ae0545f7194a 100644 --- a/dev-haskell/hspec-expectations/Manifest +++ b/dev-haskell/hspec-expectations/Manifest @@ -1,3 +1,3 @@ DIST hspec-expectations-0.8.2.tar.gz 5492 BLAKE2B ee1f50d390c2d72f50596935494b6d617d5a582376fa718a294ba33838951787d4afd1654733e6f590f166e1e36c0b651d3fc2c996ce5886e9110375af8a7750 SHA512 482799adad2a70f891a61227bcf28e6712e65fa7dceba13da15a101a6814bc0d44aafaeda360a06dcdbcdbb96e5539f15135753eabd63efdd6bf56b8994a44c9 EBUILD hspec-expectations-0.8.2.ebuild 690 BLAKE2B 100cd2ac112ff9b0319ad834869f803982e074c813790ac5538d998ab53b3ce41301472d0f96619abb64345598420f060d4fa52d9c90df7c59c69090826bfed9 SHA512 85a80dfc49fc4c04f153df65b8e4e93c62717f86942ff5fdbb0382a59735174a5e5961b07cb8b2987ca1397cc1bc44d2c1731005ed5c0ecb8abf55b3ce90cb28 -MISC metadata.xml 344 BLAKE2B 01abc86263e8cb002f11154f06c5badbc1bc280bdbe9194a6eecc7f6576272ee45980783709775a8e6b4dab95bbec5786907a048b1049d52b579f1e1bdfbf8c9 SHA512 23479d09cf9081b47179d26b552006897276f70ba283274d3f3056a3c464ed0e5ba7a679a223d52c29136adee98fb600e2c29ab32979610fbf35c76a0e58a76f +MISC metadata.xml 346 BLAKE2B 75306b6703ba30c51727062a894ca0f68400c74abed4108de3345037ca3dee070fa3f1b787d9d8bd10217c9ba434649201c76957b9050bae95133d2d09bc32da SHA512 5a61052c38fbbb1f22b88eb9306eaeb5cd8c8a231ed2accd935dfb05197151480a098ef20feb4ccf586772b8af2e25349feaaaa750ad8cab3a1b78eef775f70c diff --git a/dev-haskell/hspec-expectations/metadata.xml b/dev-haskell/hspec-expectations/metadata.xml index 532e2bdd54ae..c99ed02a022a 100644 --- a/dev-haskell/hspec-expectations/metadata.xml +++ b/dev-haskell/hspec-expectations/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Haskell</name> </maintainer> <upstream> - <remote-id type="github">sol/hspec-expectations#readme</remote-id> + <remote-id type="github">hspec/hspec-expectations#readme</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/math-functions/Manifest b/dev-haskell/math-functions/Manifest index 8820f03b4137..c70e767ea3a1 100644 --- a/dev-haskell/math-functions/Manifest +++ b/dev-haskell/math-functions/Manifest @@ -1,3 +1,3 @@ DIST math-functions-0.3.3.0.tar.gz 424169 BLAKE2B 8b53c657fb5eba8d3ab54d5ba29f7d316e8c2f4803d0587a1071fd9b6c0cf0d8a17c4dadc903280faf028622207ab84db5fb628c8826af0e615524ef45b625c5 SHA512 f6ac6f9fb604207c11d7888fa375a52b544732dd8e811c3b9bf74237bbc0dc83839eb83c11c5ef0dd88666cff4919d4e06236e14d84da7065b4dc75717ceafad EBUILD math-functions-0.3.3.0.ebuild 1042 BLAKE2B 5cde640d5ed17aff7eaf1dc7ab497dcb5f659cfbfaa3c66267edf25eedc7d401f10f0eddc3fa9db9f56685afe998e80bfd7914f47a2092616bcfe4477f3352c7 SHA512 4590f0b9ab1430390449d91238e4457f4eb4a57c05dba78549575eebd7111f6e8c79aa55415a808182385f415f882af8dff8dbdc842483ad387bc8392d631e9f -MISC metadata.xml 551 BLAKE2B 9fd2387389e22bacda7bf7195bb0221605f479a9eda213fad27069371610fdc7e6f3c90ceed4eb321ee40d3ede5a567e3b6080c0406cab4222643cc213f65a11 SHA512 f2985594e7d10823d28c1fb5f6372ab15b59711ceae57c16d7ad1dc3a60f971d6dc665ce008503258ef4d0075e6eb06609f02258f979ca8acfbe1cfb9e9db0d9 +MISC metadata.xml 555 BLAKE2B 9b0a713ad9453b4d2e9ad09455ace9a155621bf0affa279c7c7371f875c34bffab949493a627bb71f70909105e59a97d2da26d50d9fa8bfa2a882c7edd8c32a9 SHA512 1356bbd9da54d8e3cfcce5a91c572d71a70110cef3d805f782a311cd45849f8812f5c55b480378154343f2e835b3517a96bfe8e5cd17a59108aec65f441e236a diff --git a/dev-haskell/math-functions/metadata.xml b/dev-haskell/math-functions/metadata.xml index ac35e1ca28ab..34d3ae1258d4 100644 --- a/dev-haskell/math-functions/metadata.xml +++ b/dev-haskell/math-functions/metadata.xml @@ -11,6 +11,6 @@ useful in statistical and numerical computing. </longdescription> <upstream> - <remote-id type="github">bos/math-functions</remote-id> + <remote-id type="github">haskell/math-functions</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/microlens-th/Manifest b/dev-haskell/microlens-th/Manifest index 1bc9f5d73077..2144cc9b0ffd 100644 --- a/dev-haskell/microlens-th/Manifest +++ b/dev-haskell/microlens-th/Manifest @@ -1,3 +1,3 @@ DIST microlens-th-0.4.3.10.tar.gz 24189 BLAKE2B f763ecbe003339bd7102180a97f264c96dcf1e9097663a619e8044c3a03cf3d381189dfa94c1a0f6b326b7882e7017d5e07c12eb88a898592d806a0810dffadb SHA512 8c2c4984eb76ddfbde96b0a429a87fa2643c891fc680e6843abadb2691c2898eb7e89e21e6a82a6631e2115204db443346fe3459764d865b23854dbcd940e5bd -EBUILD microlens-th-0.4.3.10.ebuild 761 BLAKE2B d48ff05c19ed7c42adca0a83e4182d616ffe823cb084d43316b9fab09ff571ea7328c83c0c1d2e04701d984581ed69e2ea77260b00df665a0a213ed741adc382 SHA512 3f5fb86425385838b537266479efb1857512e56da7024faf2217a3ab0faed089d79da9abfd756e368378ac1e8051533e0b0bbdffd366aa679a01c9b9e0d804a0 -MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4 +EBUILD microlens-th-0.4.3.10.ebuild 769 BLAKE2B cf3404e5b66d108421d3117c4c94e7058089cc7b09d834858fe8ba48fd93a34a15ed2d0087b3cb9cc186ae6c73a078ea3f1fa39db21caf6c20f08c93f71f71d2 SHA512 a82ad9cd9249f37a6256af19a3e398bd3d7571b30c98929b47bcf0d6c81739c00e7a246277384d99d2604a029bba1ea8158d6ee66a70cc43f913db4549acc94a +MISC metadata.xml 341 BLAKE2B 655e3ac63126d37eeb4cbf06b287e7d78e28a2c9651a216eba538d08131d0c7ddf7b95ee3a9ea7ee8066ea42435858c7650904d1399e6b876de7737a105e5870 SHA512 77feaad6fc702fad5b6bac8e72fe9f2391f2a5c916d7b401f52903132defcc06114d7beca2a4eb9cf93c6aecd4007f272bab0cf6a403a0c836ae7e5b0933f768 diff --git a/dev-haskell/microlens-th/metadata.xml b/dev-haskell/microlens-th/metadata.xml index 937381521944..b6f08d5c0d57 100644 --- a/dev-haskell/microlens-th/metadata.xml +++ b/dev-haskell/microlens-th/metadata.xml @@ -5,4 +5,7 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> + <upstream> + <remote-id type="github">stevenfontanella/microlens</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild index 048c7a453f0d..45e2d090967c 100644 --- a/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild +++ b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Automatic generation of record lenses for microlens" -HOMEPAGE="https://github.com/monadfix/microlens" +HOMEPAGE="https://github.com/stevenfontanella/microlens" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest index fde880e0f755..c4e289499b99 100644 --- a/dev-haskell/mtl/Manifest +++ b/dev-haskell/mtl/Manifest @@ -1,3 +1,3 @@ DIST mtl-2.2.2.tar.gz 16966 BLAKE2B 29755d32aa2b0107e512ab6fff1e2695076217d81d3d46276aa2610b7054c98c01b44611b50a0127f277b54d74e0d812e52b3ae2667bf1c2913e1276993fb5d4 SHA512 25aa48f53d9b1da04bb82d9eefff2e5f797a54bc0b22d6465fcef3bee8da0a459e714f4daf69669cc28a8fef5d638d8f9b1407dad2260d67d5a63e1cc324fe7c EBUILD mtl-2.2.2.ebuild 997 BLAKE2B 15191b9d935fc27786b72329a417fa7a3f2669a4d58531108dfa68e47b02c638f2eac6f57888f99df475d00f17b63351bedee4d89c77e85288097deb42f3ceb8 SHA512 2b69026cedaf8258ec49d0e97e4c24b8bc9cc9a94a142962351adbb1efb4a08a2b150085e1582cd186ad9e0ce35147081dcc34cf1e9292d3d3170228f4904284 -MISC metadata.xml 694 BLAKE2B fe06afb660b00e8c826ca3cff8baff0a463649a0deff62585a9d2017646f2506684d928d5a775ce968662cbd8f4555a8beb4fd53762f89737d4608d3ae77133c SHA512 44b27166364106f0731855206869e5d8208ad39f4264b9a56d42c44659b6dc727c30ec7340100dd179076c2547978cb2acac27da456b960de2d368ebf81cf56e +MISC metadata.xml 695 BLAKE2B afc6bbc0d9c86cae9a99ca10f26b515a51089f5240840939c3d85ed25492902a3405421adc5ec22b77f47382e273d8f992fda78651ee5f663c5395d19a77b3d9 SHA512 e1844b2a3206ae9b6e41b075069433363a6cf1ff53a7af66a55456ca0f273f3d60a91cd6ff43604ab2f87d15bfb859f4d2760d1416de4484e73abb0293c0de9c diff --git a/dev-haskell/mtl/metadata.xml b/dev-haskell/mtl/metadata.xml index 4e84518b3cea..45ba94100750 100644 --- a/dev-haskell/mtl/metadata.xml +++ b/dev-haskell/mtl/metadata.xml @@ -13,6 +13,6 @@ (<http://web.cecs.pdx.edu/~mpj/pubs/springschool.html>). </longdescription> <upstream> - <remote-id type="github">ekmett/mtl</remote-id> + <remote-id type="github">haskell/mtl</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest index 31b4095cf9a3..c9b3bea4cb93 100644 --- a/dev-haskell/shelly/Manifest +++ b/dev-haskell/shelly/Manifest @@ -1,3 +1,3 @@ DIST shelly-1.9.0.tar.gz 73344 BLAKE2B f12e8835be5dd648427ff92b73bc9a37215a47067e65456c4c3dc8e9c2e5bb610da171648aadf9759e9a91eb075fa74d06241f83977a5380f49bc861643707cc SHA512 7c1eb25439e08095187746d0101fd92ad56ebb5a706820bad7330667cfc806066d4675c677e5d267440d4af7b517f36449e8f5e75332521780b564edc1586254 -EBUILD shelly-1.9.0.ebuild 1294 BLAKE2B 0a9da119cc9dcb024df47cdbb8eef686815ef8516cec6142801a648d379a783c833b510b2ded153915cc489368f8768cd6b7a63a00bcad55e8b60db232cd23fc SHA512 d05ee6a71478f73591783e6d8890fe18484adefc36a10bb1eeca891cf1e4e7c09f33508dd3c21279621bf82103d9ad1271b149e920273ee1d3053311858265d1 -MISC metadata.xml 1069 BLAKE2B 08d32d97f1a34cfd8b27ebce6c1574e42e5d4c88b1b0c4753aec2afe8283d646dc943f49291fbe4e6bbf599a611217eaeeb1ec64771ad340b4dbda559fbbd6e8 SHA512 10600627bba866e76df29a91005c9d72628ea5a033cf806a89354c94d06dd301bbc1c2e996602c21cfc04a49b7cb3ff3f0a877b3910f5b810c590abca853e3bf +EBUILD shelly-1.9.0.ebuild 1294 BLAKE2B 7a9a7bd0bc6c84a5ec6314a82a706bbc6d93fffe93cbbb711386b1d76b0834911b0b7b36a8dac267ac9adda68edc1be3e262a979c8a9680ed667d5785240bee3 SHA512 b2d2c0dccfbca6b54dd04fe2040bb5bad53ca246f72177faa2eaa049b41055d7c99ba021262e5033e5930502209c604172133aaeb218e285b06ea4964997e1ce +MISC metadata.xml 1069 BLAKE2B b1c5055654299fe81059b266030a5bdb4509b3b985a0ade8f77c3bb997d705b351f9c9a4591194ee4bdb9affdf521119d250edaa75e8b1c6f9e3904e1724f149 SHA512 3ba05d9f87511f61517530cb2183216b6bb4f1fc15e9a331e5b96f55ef30ffbe580d5d75065f1f6202da5269d4fbf9f1b1d1c74609ee660e69f4d4709aa42885 diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml index d7bff541690f..42a79a9eb443 100644 --- a/dev-haskell/shelly/metadata.xml +++ b/dev-haskell/shelly/metadata.xml @@ -25,7 +25,7 @@ An overview is available in the README: <https://github.com/yesodweb/Shelly.hs/blob/master/README.md> </longdescription> <upstream> - <remote-id type="github">yesodweb/Shelly.hs</remote-id> + <remote-id type="github">gregwebs/Shelly.hs</remote-id> </upstream> <use> <flag name="lifted">run the tests against Shelly.Lifted</flag> diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild index 5fc6e685f11b..b0a1202e1459 100644 --- a/dev-haskell/shelly/shelly-1.9.0.ebuild +++ b/dev-haskell/shelly/shelly-1.9.0.ebuild @@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="shell-like (systems) programming in Haskell" -HOMEPAGE="https://github.com/yesodweb/Shelly.hs" +HOMEPAGE="https://github.com/gregwebs/Shelly.hs" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" diff --git a/dev-haskell/tasty-golden/Manifest b/dev-haskell/tasty-golden/Manifest index ed7d24cc9ebe..ab3616a9fea2 100644 --- a/dev-haskell/tasty-golden/Manifest +++ b/dev-haskell/tasty-golden/Manifest @@ -1,3 +1,3 @@ DIST tasty-golden-2.3.1.1.tar.gz 7219 BLAKE2B c6160ece4ce5a35d7acc6f390a15fd83c8a13951d5bf243576aca5c65b05b8de9f57ea6227745da57c4527bcbef093dc53c955c547bb5a1c909b195a9ee9ca77 SHA512 b7871d2ddcf7f45e0f1df52982b6370308dd0c48588318985977cb88f93f4b759b1f2bdff44e31ec86f230f04304bcee14286f62c2d2ae01a6105b8a3250e5fb EBUILD tasty-golden-2.3.1.1.ebuild 832 BLAKE2B 2d6ffe906ecbab1d51b53fc1c0821c2640eba49bb79b115b0f45025d77cf0d259eb07d47bbb398811ab30d2a7ee218d636a614a9a3ad8fc0ffa2a4d6ffa765f5 SHA512 149472f937f6fbd86834a395ec9917945f82d32b1692cdbc368aa914db9a4a2544ff955d097347f930504e8131b02d09dca17741403cb3a40f77107f758ad564 -MISC metadata.xml 641 BLAKE2B 4087ced1a5c9b1f6ab4fc1d66311fc1aa675424418f780c25be63cad547a4e26aa0ef0a1513caa164f2b71e2e4ed4cb12f0758bcde53fe6f731e745ce62b876c SHA512 dfa9104c30006936d96b264022e18ebc014f89a6e14b9cdee5325de5456878ba8a657c4d0901124a324aa9fc1e11e898ec807639ecd9a188fffdd6b88302b29e +MISC metadata.xml 647 BLAKE2B 4ce8d660031c4a04076bf7beecbdfb6c88eb8753a536f447bfa18b94ab5936847bf90a55dbc8483ba855417051cc91bff697140d382ef19ee6be64aabbd8b7ad SHA512 2454a9ad7068588facbfd474c2f55d772275638e60f75ffec2ff7630186ae50f11ab4b84d81871f46c9c8121701efac1aaa32a1ff3e1094c064cbac657e8fbd0 diff --git a/dev-haskell/tasty-golden/metadata.xml b/dev-haskell/tasty-golden/metadata.xml index d648cf9ea9ee..113e8620095b 100644 --- a/dev-haskell/tasty-golden/metadata.xml +++ b/dev-haskell/tasty-golden/metadata.xml @@ -12,6 +12,6 @@ 'golden' file, which contains the correct result for the test. </longdescription> <upstream> - <remote-id type="github">feuerbach/tasty-golden</remote-id> + <remote-id type="github">UnkindPartition/tasty-golden</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/tree-diff/Manifest b/dev-haskell/tree-diff/Manifest index a16e36f75587..ce1da15f4f55 100644 --- a/dev-haskell/tree-diff/Manifest +++ b/dev-haskell/tree-diff/Manifest @@ -1,3 +1,3 @@ DIST tree-diff-0.2.1.1.tar.gz 26042 BLAKE2B c136094949b96069996ae2a68c49ca3476f75909138135a138b1c1f07b833413472d2c497418a8bb6c0c17164e78cf180b548c0d4ab5806269e7348aa86467ba SHA512 07bd947b145ebf894a5f830601529517d003bf4b0ffc9581c8204d710ed8d3941f764376add84ab1757c7d3544e984166115f37c1348a32123d99aea816a0686 -EBUILD tree-diff-0.2.1.1.ebuild 2404 BLAKE2B c54bed465166645a90e601d9938bc3d205467be059a0dd90cbf2043b04ae8b073fc249ee7935f04cb275576ec96b0137ed2c3072caefb4d90cc49c0e7c46db5e SHA512 1572bb941969cfeb33723ea8596b741da47485d09c09388b5fda9311e039b682a9aca7966d18cd074aac2ac1204263b73f2e1ac9da1917bf75f390731a403bdc -MISC metadata.xml 1046 BLAKE2B fdaf7c8f4423489f79279b1baeedc666f9eb1e9e06d8236791da111c5c058813be34791cc0338c6ea4a747396005b74cc087937b455bae18f6befd7d07587c44 SHA512 29d2feca01df15826ff4590e9d9b7593be64a65a17b0ed670109bac1b9cec4b420b39ee10321861743b21e397b6b3110b4368d4497b7edce1de77ee28ea799fb +EBUILD tree-diff-0.2.1.1.ebuild 2408 BLAKE2B 13a8e9b6f9dc86cddb9ce7cf70aaf5a763b427ce21bc2e2b7aec83e9d5c942c47b83726aa2a76fc456103050c7b95cca0f41240d8599ca6d3d933dc7003dfb13 SHA512 8b3493d456254eb49a2c0794d51d3e3d4940afa21f6aee2ed20f9c6033a70677196f6e1fb7f64a67fd3c46cf4ee50bb1be66e7aceee0de21bc64e917c37efacf +MISC metadata.xml 1131 BLAKE2B 6d64eaacf1c3c10a74ea87cfcd9441633c7a9e7a9ba694dccbf8757614e77cbddfcd736418b3cdc8f3ba0bb57ec8af3ba5c84f30ced19de82d9c38dd6acb78cc SHA512 f1f45ba94cda3ddbe4dc6622445c6daf158dd947c396633c9e5ba330d87cfe366576ea7c7245ee9e324e09b469cf96e771b0fecc88575fefb43d5a1dd1ff6b40 diff --git a/dev-haskell/tree-diff/metadata.xml b/dev-haskell/tree-diff/metadata.xml index 58a8a726ff7e..c50ae4cdef70 100644 --- a/dev-haskell/tree-diff/metadata.xml +++ b/dev-haskell/tree-diff/metadata.xml @@ -5,6 +5,9 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> + <upstream> + <remote-id type="github">haskellari/tree-diff</remote-id> + </upstream> <longdescription> Common diff algorithm works on list structures: diff --git a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild index 2252cdac16c3..8e9e4aa08d49 100644 --- a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild +++ b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Diffing of (expression) trees" -HOMEPAGE="https://github.com/phadej/tree-diff" +HOMEPAGE="https://github.com/haskellari/tree-diff" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="GPL-2+" diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest index 15d61c87772c..768c87cacb90 100644 --- a/dev-haskell/x11-xft/Manifest +++ b/dev-haskell/x11-xft/Manifest @@ -1,3 +1,3 @@ -DIST X11-xft-0.3.1.tar.gz 13621 BLAKE2B a8b7f1d042e4cc10707a8d38b570cf4af8041b978afb75eddd8ce65c7ad20a4b13de384aab51a46d298ffc4be73912381d9c8cc1d8d987069259e1dfb163f7d6 SHA512 8f40db25453227ef9ce53b05a0c6af869e3a2efdb1d9b9ad683baf52601f320c85b09f0e514bb6ffeb17516d9b75c6772aa49613bb96272d56f06788118b7cfe -EBUILD x11-xft-0.3.1-r1.ebuild 773 BLAKE2B 133ff7c0f1103aab1414295ce06b87147090fd44476dbe5a4dd64fb7d5adf32907ec07ab62ed21c2bd8d45c1b30439f83a04f0abf349f1c31ee7e43372786ff4 SHA512 d40cdf9bc46d5f746d10d1c9684ac1b227ab9f8ade7f277750576dc03a4814863d0651045086d46f24b54dfdc043c8bbe4e1661b7761cd273257f927c507e4db +DIST x11-xft-0.3.4.tar.gz 6648 BLAKE2B c83d8cc4c8a01b923342a1dd1dab007f9bfb3d6c9040edc2b48f48f903189e8ceb09ad233492150ec50bf37c2944e2350ac728e2ef61afc9516cad75f3323c24 SHA512 cd7c10bbe21f096814ebbf1015f4492ee60e73032bbb114f8fa5684e46f96239814f6986d44955642509c06b790112a38194661754e23c874dfe9446b0c13eef +EBUILD x11-xft-0.3.4.ebuild 737 BLAKE2B 0efbf3cb46548042e9b7b333ddc6c8a78d0d580979126a76f30dd7ec518ba67c5f00fa9898388aacfdc26e00ae5dd7d6bb2a2ae1b74d8c77b319625b9460866d SHA512 82e0ab5a1fc6b8d6201b9e1d7b2d539dd0c94342cf523c7f6ad2aeb7ebd8f8dc6eef29c68a81a0c4fcc48891464f80597236dff05e89e57e0f4bcfa088069c10 MISC metadata.xml 218 BLAKE2B a4171bcdd2464513ecc42102fe4b99a29e63146928db17e679dbc71bf248912ee585be783f633541e6031335029bf7c4a8edc3636c9a626a30a57547bc315440 SHA512 f65587e3686d21a5546379b88cc6a58ab53bd6fa512bc63cab7e02f5162bb876fb91f843a86fee5f1a7813abde579b61a38d6f8a9e363473eeb5e6c90691c681 diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild deleted file mode 100644 index 22e82ae5438a..000000000000 --- a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -MY_PN="X11-xft" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some Xrender parts" -HOMEPAGE="https://hackage.haskell.org/package/X11-xft" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?] - >=dev-haskell/x11-1.2.1:=[profile?] - >=dev-lang/ghc-6.10.4:= - x11-libs/libXft" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-0 - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild new file mode 100644 index 000000000000..5967f57c6db3 --- /dev/null +++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.2.1.9999 +#hackport: flags: -pedantic +CABAL_PN="X11-xft" + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Bindings to the Xft and some Xrender parts" +HOMEPAGE="https://hackage.haskell.org/package/X11-xft" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?] + >=dev-haskell/x11-1.2.1:=[xinerama,profile?] + >=dev-lang/ghc-8.4.3:= + x11-libs/libXft +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 +" +BDEPEND="virtual/pkgconfig +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-pedantic +} diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest index 91248ade250c..615e501827b4 100644 --- a/dev-haskell/x11/Manifest +++ b/dev-haskell/x11/Manifest @@ -1,6 +1,4 @@ AUX x11-1.9-no-LDFLAGS.patch 296 BLAKE2B 8ab586c978cbf6a224bd4edb65be6e19f7135ad5572c28fc732ab0e12b975840a08178cc8edead2589b6ea3b027c02967fbb013f6b95bc4a7d6fae85f7f508f5 SHA512 0937dda56fe2590c75bd3c1be5bfaaf87b9dfd4c960978143cc689f8e762c9a2f7ad056029c850e8fd52e367d75816866c8136635e1056da2101bed68a88bbc1 -DIST X11-1.10.tar.gz 192493 BLAKE2B 7c951eaf3a009302b2b7d3a9aeb866b908e99f60b408aaae75375e0fbdd12254c283ad27a0e2354cc0c6be745fa507c0bf64a763c548037a640eb8927923246e SHA512 7976a151edf9a54e4278f65903ec6b177211f8209039c4e2747abddd9ed86db51a6e65c5359297443b5ade513d9ca8e452cff033d9d0261f3fb027113765bb89 -DIST X11-1.9.2.tar.gz 190757 BLAKE2B cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec SHA512 e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41 -EBUILD x11-1.10-r1.ebuild 976 BLAKE2B caf534229e8b89c113286cdbd901fc6d4d58a6ae4697c96c64d8c8de8671942077e0cf78f935a6f49ac0a84b1d622c364eb6e2ecdd29189cf620b5af958f0ff3 SHA512 c4ca945f9f0391500073358b47f535572b52b52a171188adc2cfe8ad3806f1a9a7952f7ae57d20fea8258302b0119ec1167f2712bb5eb37451d2bcf05a224b52 -EBUILD x11-1.9.2.ebuild 941 BLAKE2B 82064b0310daa30aa54e6c285de9999bcf0588f77ca3269c63f022932bb3e349e66258da90e4d816cadd17d36a676e04c38ed15a96ef1a05f4239c7fcdcc4375 SHA512 69273118f44da0a00ff34bdc73da22f1ad274243e8f568fbce5afdb877bd61e24e554a942d31d39d98917e135782b7aefdb5598ba7b367ccb909baf7980cfc91 +DIST x11-1.10.2.tar.gz 192634 BLAKE2B a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e SHA512 5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4 +EBUILD x11-1.10.2.ebuild 964 BLAKE2B 7e81a2cb1b5909ea0c1b4822d717381237851397f901cc38b362c1c9263593cfef5d908c825c3899d87a561fa4b5ca0cc287111298da3fcfa8d8f43afe7fa963 SHA512 3e80a4053048a73cb360178b6c1f5f3e28c91b4e30dd110b7664f1880404875ff555ed3f44cf3ac7dcc2498ff35172baf10e1c8fe3a3154b1aa32be6061b011a MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4 diff --git a/dev-haskell/x11/x11-1.10-r1.ebuild b/dev-haskell/x11/x11-1.10.2.ebuild index a9792bfb0016..794d6d454c07 100644 --- a/dev-haskell/x11/x11-1.10-r1.ebuild +++ b/dev-haskell/x11/x11-1.10.2.ebuild @@ -3,30 +3,30 @@ EAPI=8 -# ebuild generated by hackport 0.7.9999 -#hackport: flags:-pedantic +# ebuild generated by hackport 0.7.2.1.9999 +#hackport: flags: -pedantic +CABAL_PN="X11" + CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal -MY_PN="X11" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - DESCRIPTION="A binding to the X11 graphics library" HOMEPAGE="https://github.com/xmonad/X11" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+xinerama" -# remember to add libXScrnSaver manually on bumps, or src_configure will fail. +# add +xinerama to IUSE and RDEPEND on libXScrnSaver and libXinerama below RDEPEND=">=dev-haskell/data-default-class-0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver + xinerama? ( x11-libs/libXinerama ) + " DEPEND="${RDEPEND} >=dev-haskell/cabal-2.2.0.1 @@ -34,5 +34,6 @@ DEPEND="${RDEPEND} src_configure() { haskell-cabal_src_configure \ - --flag=-pedantic + --flag=-pedantic \ + --configure-option=$(use_with xinerama) } diff --git a/dev-haskell/x11/x11-1.9.2.ebuild b/dev-haskell/x11/x11-1.9.2.ebuild deleted file mode 100644 index 9c2823eba68f..000000000000 --- a/dev-haskell/x11/x11-1.9.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.6.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -MY_PN="X11" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A binding to the X11 graphics library" -HOMEPAGE="https://github.com/xmonad/X11" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+xinerama" - -RDEPEND="dev-haskell/data-default:=[profile?] - >=dev-lang/ghc-7.4.1:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch -) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - haskell-cabal_src_configure \ - --configure-option=$(use_with xinerama) -} |