From nobody Thu Jul 07 10:25:54 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1BA4212AFC45; Thu, 7 Jul 2022 10:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ldsxt70mGz3Jr6; Thu, 7 Jul 2022 10:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657189559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5+p/KEk88nSjlyDsviEl4V/7Nnb/VnxLzsZ3TQqNUaM=; b=ytWFBm9iBZsE/DapcZ1PDDn7xzex7Sez5X2qFmbzSUwftW8oxXz0lEweb4fcGjKy8JmwvV /m/93ghVLI78z8DGLEoOd/EOX3/RYRFcGNT5qt49o5rIaEVWzrbVMpk2PhKLVrh+9cWMx6 i/iIrRmTz4rTedCvcRILwxKs+xBHuGeZf9oKwuudytDpDKWShvcMj2Uvp648sXBiNN1cEq yf4VmFczYTCllMjhzteyBP+WMSL+mWtqkTAumyFe6JRGIeLiBfuTVuuTS8sugERT8y2tUo TlwZYLd7rjalN0ZtKnA6z6aNg7DbKY4/RBUuTVBMiz6roocmo7v2bTQqXcRAjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ldsxt13lFzg4f; Thu, 7 Jul 2022 10:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 267APsua096103; Thu, 7 Jul 2022 10:25:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267APsG0096102; Thu, 7 Jul 2022 10:25:54 GMT (envelope-from git) Date: Thu, 7 Jul 2022 10:25:54 GMT Message-Id: <202207071025.267APsG0096102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 2d1dc289bc20 - main - devel/elm-format: Update to 0.8.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d1dc289bc20e75e5db0ab97e23bb7b2dd138db2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657189559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5+p/KEk88nSjlyDsviEl4V/7Nnb/VnxLzsZ3TQqNUaM=; b=h+Wj2IN4XR/Ah0GJEodAYCFWz1wksyQGBb7qPNnDu2EeQV7je6/LSbFndhrh8XUEiav17z 72a5PclsvBo+HFAPRiZxc3vvUmNOkNP0VS0NcCNr2fzHtY9CeWCWQYsNM9IMG+DbbS3h+e K60o4x2G7w9t6AqwiEIgAzCilHgr8sJMlScULOW39MYeAcHzfvrt7y5XWHDBWS4Wfpo6dQ ypqEMxXHHV7XtZ6mbg7Sazq3htnc5zpwxB+eC7c2ylQ3nIDBrUoKOxjBx4gALZC6+0i54P ii0+wUrpwNXG92TP/rRgBzCxqOYSZP40J2TZdihHymnsKvX+vhO1qM/n+8g2uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657189559; a=rsa-sha256; cv=none; b=a7V3ly6oE+Icpkw3yyxbgBW/fVFvlWkaAtu3J6yaQZTSqFCxFwH9sguf4dkGlyZ0ZgU0v5 7Bfb4XWPl32yGf0Rjg/FFCFOeDWqd3s6JUtDn3I2c29RNQZ6Rqd2Io7fkDE9Bn95gRAmp9 vie7pqFrNRqpOOYcObPc1gNVEQhmqw2O5VTETtSeTwCIInxG6myR44x2rU8dJvwkBplJJL FKrZdLL6cGdx/BWBxduZ52Dvb9oa7fSs1mtMa1gwN0Zb9HHdjRfXdEvW5nGDP9IC9zr1sB qLybW1kO/wMHZWc5Z+x6jubgiPWZUaf2cOYiJaj7zK0isaeuiEtbW3FBHDZ5UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d1dc289bc20e75e5db0ab97e23bb7b2dd138db2 commit 2d1dc289bc20e75e5db0ab97e23bb7b2dd138db2 Author: Gleb Popov AuthorDate: 2022-06-13 22:43:28 +0000 Commit: Gleb Popov CommitDate: 2022-07-07 10:24:39 +0000 devel/elm-format: Update to 0.8.5 --- devel/elm-format/Makefile | 72 +++++++---- devel/elm-format/distinfo | 140 ++++++++++++--------- .../elm-format/files/patch-avh4-lib_avh4-lib.cabal | 18 +++ .../patch-elm-format-lib_elm-format-lib.cabal | 20 +++ ...h-elm-format-test-lib_elm-format-test-lib.cabal | 19 +++ devel/elm-format/files/patch-elm-format.cabal | 31 ++--- .../patch-markdown_Cheapskate_ParserCombinators.hs | 32 ----- .../files/patch-src_ElmFormat_Version.hs | 15 --- 8 files changed, 196 insertions(+), 151 deletions(-) diff --git a/devel/elm-format/Makefile b/devel/elm-format/Makefile index b1b1517f6b9f..746fb0d77ba8 100644 --- a/devel/elm-format/Makefile +++ b/devel/elm-format/Makefile @@ -1,6 +1,5 @@ PORTNAME= elm-format -PORTVERSION= 0.8.3 -PORTREVISION= 4 +PORTVERSION= 0.8.5 CATEGORIES= devel textproc MAINTAINER= haskell@FreeBSD.org @@ -12,36 +11,57 @@ USES= cabal USE_GITHUB= yes GH_ACCOUNT= avh4 -USE_CABAL= ansi-terminal-0.8.2 \ - ansi-wl-pprint-0.6.8.2_2 \ - base-orphans-0.8.2 \ - bifunctors-5.5.7 \ - cabal-doctest-1.0.8_1 \ - colour-2.3.5 \ - comonad-5.0.6 \ +USE_CABAL= HUnit-1.6.2.0 \ + QuickCheck-2.14.2 \ + ansi-terminal-0.10.3 \ + ansi-wl-pprint-0.6.9_3 \ + bimap-0.3.3 \ + call-stack-0.4.0 \ + clock-0.8.3 \ + colour-2.3.6 \ concatenative-1.0.1 \ - contravariant-1.5.2 \ - distributive-0.6.1 \ - exceptions-0.10.4_1 \ - free-5.1.3 \ - hashable-1.3.0.0_1 \ + hashable-1.4.0.2 \ + hspec-2.10.0 \ + hspec-core-2.10.0 \ + hspec-discover-2.10.0 \ + hspec-expectations-0.8.2 \ + hspec-golden-0.2.0.0 \ indents-0.3.3 \ json-0.10_1 \ + logict-0.8.0.0 \ optparse-applicative-0.15.1.0_1 \ - profunctors-5.5.2 \ - semigroupoids-5.3.4 \ - split-0.2.3.4 \ - StateVar-1.2 \ - syb-0.7.1 \ - tagged-0.8.6_2 \ - th-abstraction-0.3.2.0 \ - transformers-base-0.4.5.2 \ - transformers-compat-0.6.5 \ - unordered-containers-0.2.10.0_1 + primitive-0.7.4.0 \ + quickcheck-io-0.2.0 \ + random-1.2.1.1 \ + relude-1.1.0.0 \ + setenv-0.1.1.3_1 \ + smallcheck-1.2.1_1 \ + split-0.2.3.4_2 \ + splitmix-0.1.0.4 \ + syb-0.7.2.1 \ + tagged-0.8.6.1_2 \ + tasty-1.4.2.3 \ + tasty-hspec-1.2.0.1 \ + tasty-hunit-0.10.0.3 \ + tasty-quickcheck-0.10.2 \ + tasty-smallcheck-0.8.2_1 \ + tf-random-0.5 \ + transformers-compat-0.6.6 \ + unbounded-delays-0.1.1.1 \ + unordered-containers-0.2.19.1 \ + wcwidth-0.0.2 + +CABAL_PROJECT= append + +post-extract: + ${RM} ${WRKSRC}/cabal.project.freeze + ${ECHO} "module Build_elm_format where" > ${WRKSRC}/src/Build_elm_format.hs + ${ECHO} "gitDescribe :: String" >> ${WRKSRC}/src/Build_elm_format.hs + ${ECHO} "gitDescribe = \"${PORTNAME}\"" >> ${WRKSRC}/src/Build_elm_format.hs post-patch: - @${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' \ - ${WRKSRC}/src/ElmFormat/Version.hs + @${REINPLACE_CMD} -e '/with-compiler: ghc-8.10.4/d' \ + ${WRKSRC}/cabal.project.${PORTNAME} ${RM} ${WRKSRC}/cabal.config .include diff --git a/devel/elm-format/distinfo b/devel/elm-format/distinfo index 86423c96f51b..73a157a9c910 100644 --- a/devel/elm-format/distinfo +++ b/devel/elm-format/distinfo @@ -1,71 +1,97 @@ -TIMESTAMP = 1586092270 -SHA256 (cabal/StateVar-1.2/StateVar-1.2.tar.gz) = afc036021fcd38f15fcc4af392a3e57017d5ddcc926e99391dbfc8c4e6375f8b -SIZE (cabal/StateVar-1.2/StateVar-1.2.tar.gz) = 4770 -SHA256 (cabal/ansi-terminal-0.8.2/ansi-terminal-0.8.2.tar.gz) = 90a7324811e7da0d0aecd66454b1622e3b1ee22ed09bbdae379c0ff079d2fa90 -SIZE (cabal/ansi-terminal-0.8.2/ansi-terminal-0.8.2.tar.gz) = 31357 -SHA256 (cabal/ansi-wl-pprint-0.6.8.2/ansi-wl-pprint-0.6.8.2.tar.gz) = a630721bd57678c3bfeb6c703f8249e434cbf85f40daceec4660fb8c6725cb3e -SIZE (cabal/ansi-wl-pprint-0.6.8.2/ansi-wl-pprint-0.6.8.2.tar.gz) = 16491 -SHA256 (cabal/ansi-wl-pprint-0.6.8.2/revision/2.cabal) = a890b713942c1aa0109fb632e9fee581ceb5b0763fd936ae8cae22e5f91a0877 -SIZE (cabal/ansi-wl-pprint-0.6.8.2/revision/2.cabal) = 2178 -SHA256 (cabal/base-orphans-0.8.2/base-orphans-0.8.2.tar.gz) = 2a8062385e5d5dee418428a22c72b9391557bc1fe2f93bd643f7754b36b9eb01 -SIZE (cabal/base-orphans-0.8.2/base-orphans-0.8.2.tar.gz) = 20727 -SHA256 (cabal/bifunctors-5.5.7/bifunctors-5.5.7.tar.gz) = 88b3a2d4504e1139a3aef7027913faa0870631477d0a2ebb6fa67d494cdb3532 -SIZE (cabal/bifunctors-5.5.7/bifunctors-5.5.7.tar.gz) = 45689 -SHA256 (cabal/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz) = 2026a6a87d410202ce091412ca6bc33c5aca787025326b4a3d13425a23392e0e -SIZE (cabal/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz) = 10812 -SHA256 (cabal/cabal-doctest-1.0.8/revision/1.cabal) = 34dff6369d417df2699af4e15f06bc181d495eca9c51efde173deae2053c197c -SIZE (cabal/cabal-doctest-1.0.8/revision/1.cabal) = 1491 -SHA256 (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 3b8d471979617dce7c193523743c9782df63433d8e87e3ef6d97922e0da104e7 -SIZE (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 20485 -SHA256 (cabal/comonad-5.0.6/comonad-5.0.6.tar.gz) = 77cfb016acd1747b892c31b82daf0de93f508ba775d62562d376b354adb88fae -SIZE (cabal/comonad-5.0.6/comonad-5.0.6.tar.gz) = 18154 +TIMESTAMP = 1655157104 +SHA256 (cabal/HUnit-1.6.2.0/HUnit-1.6.2.0.tar.gz) = b0b7538871ffc058486fc00740886d2f3172f8fa6869936bfe83a5e10bd744ab +SIZE (cabal/HUnit-1.6.2.0/HUnit-1.6.2.0.tar.gz) = 21179 +SHA256 (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3 +SIZE (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = 75246 +SHA256 (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = fa2e2e32dfad29835aa7fd442bbe233e07d97e933223a001fe5efa562535b57c +SIZE (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = 35863 +SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac +SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723 +SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce +SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425 +SHA256 (cabal/bimap-0.3.3/bimap-0.3.3.tar.gz) = 73829355c7bcbd3eedba22a382a04a3ab641702b00828790ec082ec2db3a8ad1 +SIZE (cabal/bimap-0.3.3/bimap-0.3.3.tar.gz) = 10505 +SHA256 (cabal/call-stack-0.4.0/call-stack-0.4.0.tar.gz) = 430bcf8a3404f7e55319573c0b807b1356946f0c8f289bb3d9afb279c636b87b +SIZE (cabal/call-stack-0.4.0/call-stack-0.4.0.tar.gz) = 2757 +SHA256 (cabal/clock-0.8.3/clock-0.8.3.tar.gz) = 845ce5db4c98cefd517323e005f87effceff886987305e421c4ef616dc0505d1 +SIZE (cabal/clock-0.8.3/clock-0.8.3.tar.gz) = 9099 +SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871 +SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675 SHA256 (cabal/concatenative-1.0.1/concatenative-1.0.1.tar.gz) = ed5997924518f0ca6b8afcd4e1ee10d30675bb4c4ba164a4d70b4ddbd8c6bc17 SIZE (cabal/concatenative-1.0.1/concatenative-1.0.1.tar.gz) = 3723 -SHA256 (cabal/contravariant-1.5.2/contravariant-1.5.2.tar.gz) = c4262c24e3dcc2ba8ca221ed52a6390818a715301e4f13135d8d732e0c7dc60c -SIZE (cabal/contravariant-1.5.2/contravariant-1.5.2.tar.gz) = 16006 -SHA256 (cabal/distributive-0.6.1/distributive-0.6.1.tar.gz) = 7749b1d9b815e3ba558d1daebac9346610e352bb0dfe9720cc686eb2fef7caf2 -SIZE (cabal/distributive-0.6.1/distributive-0.6.1.tar.gz) = 11256 -SHA256 (cabal/exceptions-0.10.4/exceptions-0.10.4.tar.gz) = 4d0bfb4355cffcd67d300811df9d5fe44ea3594ed63750795bfc1f797abd84cf -SIZE (cabal/exceptions-0.10.4/exceptions-0.10.4.tar.gz) = 20819 -SHA256 (cabal/exceptions-0.10.4/revision/1.cabal) = 1729ef26a611ae78aa58cdd34192aff710cbaa6d631dd042ddfb63556d00b52c -SIZE (cabal/exceptions-0.10.4/revision/1.cabal) = 2796 -SHA256 (cabal/free-5.1.3/free-5.1.3.tar.gz) = 2c70d66e3a1ad52ce4b22d5510ffc6d7b3db950bd7f43bc61801cfe7b24c2e2d -SIZE (cabal/free-5.1.3/free-5.1.3.tar.gz) = 64257 -SHA256 (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4 -SIZE (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 29835 -SHA256 (cabal/hashable-1.3.0.0/revision/1.cabal) = 4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1 -SIZE (cabal/hashable-1.3.0.0/revision/1.cabal) = 5206 +SHA256 (cabal/hashable-1.4.0.2/hashable-1.4.0.2.tar.gz) = 83606edd356d914c075ecd44f6d5fe91a3b186aa0683c8dd8c9a7e8e22a47600 +SIZE (cabal/hashable-1.4.0.2/hashable-1.4.0.2.tar.gz) = 25528 +SHA256 (cabal/hspec-2.10.0/hspec-2.10.0.tar.gz) = 954c5e940cf661ab03fa70ebe7e88d38954011321c4ff0e5cf089f4adb0684d0 +SIZE (cabal/hspec-2.10.0/hspec-2.10.0.tar.gz) = 10429 +SHA256 (cabal/hspec-core-2.10.0/hspec-core-2.10.0.tar.gz) = afa499843294586b96683a06fba42077ebb05bc0da3ae0b1f10b6bbfaf0579c2 +SIZE (cabal/hspec-core-2.10.0/hspec-core-2.10.0.tar.gz) = 84716 +SHA256 (cabal/hspec-discover-2.10.0/hspec-discover-2.10.0.tar.gz) = b5d78719cadd02402ab8ea912e754c57bfb2598c9e0b3b2cfa05f9f200897f64 +SIZE (cabal/hspec-discover-2.10.0/hspec-discover-2.10.0.tar.gz) = 6836 +SHA256 (cabal/hspec-expectations-0.8.2/hspec-expectations-0.8.2.tar.gz) = 819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef +SIZE (cabal/hspec-expectations-0.8.2/hspec-expectations-0.8.2.tar.gz) = 5492 +SHA256 (cabal/hspec-golden-0.2.0.0/hspec-golden-0.2.0.0.tar.gz) = d322dd7d625dd3f1c5fd30e7965be127744bfa0f6b337983352f44d1c771e969 +SIZE (cabal/hspec-golden-0.2.0.0/hspec-golden-0.2.0.0.tar.gz) = 6150 SHA256 (cabal/indents-0.3.3/indents-0.3.3.tar.gz) = b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a SIZE (cabal/indents-0.3.3/indents-0.3.3.tar.gz) = 3841 SHA256 (cabal/json-0.10/json-0.10.tar.gz) = 0c046a3c03c9332816d3c9e50319b1d1eb3c2c1baba1123a7650d047b26856ba SIZE (cabal/json-0.10/json-0.10.tar.gz) = 22622 SHA256 (cabal/json-0.10/revision/1.cabal) = d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799 SIZE (cabal/json-0.10/revision/1.cabal) = 3210 +SHA256 (cabal/logict-0.8.0.0/logict-0.8.0.0.tar.gz) = fe926df295bc43df794247360e7a0a0dfdc778bce986f8aadba98fe52228fb56 +SIZE (cabal/logict-0.8.0.0/logict-0.8.0.0.tar.gz) = 17427 SHA256 (cabal/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz) = 4db3675fd1e0594afdf079db46f4cd412d483835d703e7c07e1a1a37d6f046f3 SIZE (cabal/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz) = 56203 SHA256 (cabal/optparse-applicative-0.15.1.0/revision/1.cabal) = 29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e SIZE (cabal/optparse-applicative-0.15.1.0/revision/1.cabal) = 4810 -SHA256 (cabal/profunctors-5.5.2/profunctors-5.5.2.tar.gz) = 5f1579aab8afae377c7c7c0d0ed95b0bc58003b6dad2d494045f7472a398af7c -SIZE (cabal/profunctors-5.5.2/profunctors-5.5.2.tar.gz) = 30041 -SHA256 (cabal/semigroupoids-5.3.4/semigroupoids-5.3.4.tar.gz) = 00d2e48973c3ab0a5d52616728ed63d0509454c8328148f698720014d7c58964 -SIZE (cabal/semigroupoids-5.3.4/semigroupoids-5.3.4.tar.gz) = 26307 +SHA256 (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5 +SIZE (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 56575 +SHA256 (cabal/quickcheck-io-0.2.0/quickcheck-io-0.2.0.tar.gz) = fb779119d79fe08ff4d502fb6869a70c9a8d5fd8ae0959f605c3c937efd96422 +SIZE (cabal/quickcheck-io-0.2.0/quickcheck-io-0.2.0.tar.gz) = 1843 +SHA256 (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76 +SIZE (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 47109 +SHA256 (cabal/relude-1.1.0.0/relude-1.1.0.0.tar.gz) = b51df08a93ef1331dd56389e158e67ac7b68c62cc1561c2890d3572c764ab609 +SIZE (cabal/relude-1.1.0.0/relude-1.1.0.0.tar.gz) = 71858 +SHA256 (cabal/setenv-0.1.1.3/setenv-0.1.1.3.tar.gz) = e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32 +SIZE (cabal/setenv-0.1.1.3/setenv-0.1.1.3.tar.gz) = 2710 +SHA256 (cabal/setenv-0.1.1.3/revision/1.cabal) = c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b +SIZE (cabal/setenv-0.1.1.3/revision/1.cabal) = 1053 +SHA256 (cabal/smallcheck-1.2.1/smallcheck-1.2.1.tar.gz) = e41f9d11b50e0526dd28c9bc6cf6dddf98cebd782911a00c3e5cbe4ce53fc869 +SIZE (cabal/smallcheck-1.2.1/smallcheck-1.2.1.tar.gz) = 18932 +SHA256 (cabal/smallcheck-1.2.1/revision/1.cabal) = 2bc8dd48aa3bb7f06637b4e05092b4ccb60057134e29c8b87f247988cada3490 +SIZE (cabal/smallcheck-1.2.1/revision/1.cabal) = 1596 SHA256 (cabal/split-0.2.3.4/split-0.2.3.4.tar.gz) = 271fe5104c9f40034aa9a1aad6269bcecc9454bc5a57c247e69e17de996c1f2a SIZE (cabal/split-0.2.3.4/split-0.2.3.4.tar.gz) = 15942 -SHA256 (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = e04a9c7ae48d9fe25e9b7a064f7122d39c710753544511e15df7a6e87fdfe700 -SIZE (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = 39594 -SHA256 (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = ad16def0884cf6f05ae1ae8e90192cf9d8d9673fa264b249499bd9e4fac791dd -SIZE (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = 11759 -SHA256 (cabal/tagged-0.8.6/revision/2.cabal) = 1f7ca84e6c88cbb923641c60041c9f56c34f1a889759cc073cdf10542b441ff9 -SIZE (cabal/tagged-0.8.6/revision/2.cabal) = 2606 -SHA256 (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 36fef33ad0f34b9b8fb5552fe6187579a00d5f90d938e9bc24d382a9919feb79 -SIZE (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 35111 -SHA256 (cabal/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz) = d0c80c63fdce6a077dd8eda4f1ff289b85578703a3f1272e141d400fe23245e8 -SIZE (cabal/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz) = 2849 -SHA256 (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = da67cf11515da751b32a8ce6e96549f7268f7c435769ad19dc9766b69774620b -SIZE (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = 40421 -SHA256 (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 65f117bdbdea9efc75fb9fd539873de7687e005d8898bb21821020a4b383c573 -SIZE (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 44733 -SHA256 (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204 -SIZE (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5199 -SHA256 (cabal/avh4-elm-format-0.8.3_GH0.tar.gz) = 6bef1e7bf5d8781d30ad3b98a33ce4a550da7e80dbae8b9b80b6a28a7b1a6ba9 -SIZE (cabal/avh4-elm-format-0.8.3_GH0.tar.gz) = 342385 +SHA256 (cabal/split-0.2.3.4/revision/2.cabal) = a6df9c3e806ee7cb50bc980a183fc1156f35022a39430dabac0bf9456fe18a4b +SIZE (cabal/split-0.2.3.4/revision/2.cabal) = 2647 +SHA256 (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa +SIZE (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 22382 +SHA256 (cabal/syb-0.7.2.1/syb-0.7.2.1.tar.gz) = 1807c66f77e66786739387f0ae9f16d150d1cfa9d626afcb729f0e9b442a8d96 +SIZE (cabal/syb-0.7.2.1/syb-0.7.2.1.tar.gz) = 39768 +SHA256 (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = f5e0fcf95f0bb4aa63f428f2c01955a41ea1a42cfcf39145ed631f59a9616c02 +SIZE (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = 9842 +SHA256 (cabal/tagged-0.8.6.1/revision/2.cabal) = 29c67d98a4404607f024750ab9c7210dadcbbef4e1944c48c52902f2071b2662 +SIZE (cabal/tagged-0.8.6.1/revision/2.cabal) = 2874 +SHA256 (cabal/tasty-1.4.2.3/tasty-1.4.2.3.tar.gz) = c914a7a9a28dfc33dc5a112c349f2e69f536cb66d2b2b44898a3411cbdcad0c6 +SIZE (cabal/tasty-1.4.2.3/tasty-1.4.2.3.tar.gz) = 58549 +SHA256 (cabal/tasty-hspec-1.2.0.1/tasty-hspec-1.2.0.1.tar.gz) = 21813eff5187cd2489b855153466949b7379cfb2c7fc98ab680ad76a62177445 +SIZE (cabal/tasty-hspec-1.2.0.1/tasty-hspec-1.2.0.1.tar.gz) = 5662 +SHA256 (cabal/tasty-hunit-0.10.0.3/tasty-hunit-0.10.0.3.tar.gz) = b7ef1912ece25b9396d2c69c31e63f82facc95edac8fc1abbf84e8c3c7ffe63f +SIZE (cabal/tasty-hunit-0.10.0.3/tasty-hunit-0.10.0.3.tar.gz) = 7885 +SHA256 (cabal/tasty-quickcheck-0.10.2/tasty-quickcheck-0.10.2.tar.gz) = b4884c815db26a543ee1062664ee051ac89d51b2c2526d30029c6eb95b36cce2 +SIZE (cabal/tasty-quickcheck-0.10.2/tasty-quickcheck-0.10.2.tar.gz) = 5868 +SHA256 (cabal/tasty-smallcheck-0.8.2/tasty-smallcheck-0.8.2.tar.gz) = d5cbd7a2a7100e4afd3aaac01a8fa1b7814fb074d93aeff1b51240b687e54f33 +SIZE (cabal/tasty-smallcheck-0.8.2/tasty-smallcheck-0.8.2.tar.gz) = 3041 +SHA256 (cabal/tasty-smallcheck-0.8.2/revision/1.cabal) = b0eeb241a4d34401dbc23790b56989a6089b9b9b2dc07f7b0eece7c485826300 +SIZE (cabal/tasty-smallcheck-0.8.2/revision/1.cabal) = 1189 +SHA256 (cabal/tf-random-0.5/tf-random-0.5.tar.gz) = 2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510 +SIZE (cabal/tf-random-0.5/tf-random-0.5.tar.gz) = 18483 +SHA256 (cabal/transformers-compat-0.6.6/transformers-compat-0.6.6.tar.gz) = 7e2e0251e5e6d28142615a4b950a3fabac9c0b7804b1ec4a4ae985f19519a9f9 +SIZE (cabal/transformers-compat-0.6.6/transformers-compat-0.6.6.tar.gz) = 41347 +SHA256 (cabal/unbounded-delays-0.1.1.1/unbounded-delays-0.1.1.1.tar.gz) = 59ad7e53bfe32ffbf0e703b31490d41d14c70e4745ed49e8adf592ed68dd6185 +SIZE (cabal/unbounded-delays-0.1.1.1/unbounded-delays-0.1.1.1.tar.gz) = 4114 +SHA256 (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2 +SIZE (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 58030 +SHA256 (cabal/wcwidth-0.0.2/wcwidth-0.0.2.tar.gz) = ffc68736a3bbde3e8157710f29f4a99c0ca593c41194579c54a92c62f6c12ed8 +SIZE (cabal/wcwidth-0.0.2/wcwidth-0.0.2.tar.gz) = 4168 +SHA256 (cabal/avh4-elm-format-0.8.5_GH0.tar.gz) = 20a600f71dfcf8ca45ebf24c8d00f7e75bc6a2604f9a0fe1e25a9714a8fcee8f +SIZE (cabal/avh4-elm-format-0.8.5_GH0.tar.gz) = 355136 diff --git a/devel/elm-format/files/patch-avh4-lib_avh4-lib.cabal b/devel/elm-format/files/patch-avh4-lib_avh4-lib.cabal new file mode 100644 index 000000000000..652e7ccfc42e --- /dev/null +++ b/devel/elm-format/files/patch-avh4-lib_avh4-lib.cabal @@ -0,0 +1,18 @@ +--- avh4-lib/avh4-lib.cabal.orig 2021-02-09 02:18:35 UTC ++++ avh4-lib/avh4-lib.cabal +@@ -39,13 +39,13 @@ common common-options + base >= 4.12.0.0 && < 5, + bimap >= 0.3.3 && < 0.4, + binary >= 0.8.6.0 && < 0.9, +- bytestring >= 0.10.8.2 && < 0.11, ++ bytestring, + containers >= 0.6.0.1 && < 0.7, + directory >= 1.3.3.0 && < 2, + filepath >= 1.4.2.1 && < 2, + mtl >= 2.2.2 && < 3, + process >= 1.6.5.0 && < 2, +- relude >= 0.7 && < 0.8, ++ relude, + text >= 1.2.3.1 && < 2 + + diff --git a/devel/elm-format/files/patch-elm-format-lib_elm-format-lib.cabal b/devel/elm-format/files/patch-elm-format-lib_elm-format-lib.cabal new file mode 100644 index 000000000000..73447da43a79 --- /dev/null +++ b/devel/elm-format/files/patch-elm-format-lib_elm-format-lib.cabal @@ -0,0 +1,20 @@ +--- elm-format-lib/elm-format-lib.cabal.orig 2021-02-09 02:18:35 UTC ++++ elm-format-lib/elm-format-lib.cabal +@@ -59,7 +59,7 @@ common common-options + base >= 4.12.0.0 && < 5, + bimap >= 0.3.3 && < 0.4, + binary >= 0.8.6.0 && < 0.9, +- bytestring >= 0.10.8.2 && < 0.11, ++ bytestring, + containers >= 0.6.0.1 && < 0.7, + directory >= 1.3.3.0 && < 2, + filepath >= 1.4.2.1 && < 2, +@@ -69,7 +69,7 @@ common common-options + optparse-applicative >= 0.15.1.0 && < 0.16, + parsec >= 3.1.13.0 && < 4, + process >= 1.6.5.0 && < 2, +- relude >= 0.7 && < 0.8, ++ relude, + text >= 1.2.3.1 && < 2, + avh4-lib, + elm-format-markdown diff --git a/devel/elm-format/files/patch-elm-format-test-lib_elm-format-test-lib.cabal b/devel/elm-format/files/patch-elm-format-test-lib_elm-format-test-lib.cabal new file mode 100644 index 000000000000..8c3c3d9ad0e1 --- /dev/null +++ b/devel/elm-format/files/patch-elm-format-test-lib_elm-format-test-lib.cabal @@ -0,0 +1,19 @@ +--- elm-format-test-lib/elm-format-test-lib.cabal.orig 2021-02-09 02:18:35 UTC ++++ elm-format-test-lib/elm-format-test-lib.cabal +@@ -38,12 +38,12 @@ common common-options + containers >= 0.6.0.1 && < 0.7, + filepath >= 1.4.2.1 && < 1.5, + hspec-core >= 2.7.4 && < 3, +- hspec-golden >= 0.1.0.3 && < 0.2, ++ hspec-golden, + mtl >= 2.2.2 && < 3, + split >= 0.2.3.3 && < 0.3, +- tasty >= 1.2 && < 2, +- tasty-hspec >= 1.1.5.1 && < 1.2, +- tasty-hunit >= 0.10.0.1 && < 0.11, ++ tasty, ++ tasty-hspec, ++ tasty-hunit, + text >= 1.2.3.1 && < 2, + avh4-lib + diff --git a/devel/elm-format/files/patch-elm-format.cabal b/devel/elm-format/files/patch-elm-format.cabal index 1f21489ea471..ec935d8b441f 100644 --- a/devel/elm-format/files/patch-elm-format.cabal +++ b/devel/elm-format/files/patch-elm-format.cabal @@ -1,22 +1,11 @@ ---- elm-format.cabal.orig 2020-02-25 17:08:42 UTC +--- elm-format.cabal.orig 2021-02-09 02:18:35 UTC +++ elm-format.cabal -@@ -76,7 +76,6 @@ library - AST.Json - AST.MapExpr - AST.MapNamespace -- Build_elm_format - Cheapskate.Inlines - Cheapskate.Parse - Cheapskate.ParserCombinators -@@ -122,9 +121,9 @@ library - filepath >= 1.4.2.1 && < 2, - free >= 5.1.1 && < 6, - indents >= 0.3.3 && < 0.4, -- json >= 0.9.3 && < 0.10, -+ json >= 0.9.3 && <= 0.10, - mtl >= 2.2.2 && < 3, -- optparse-applicative >= 0.14.3.0 && < 0.15, -+ optparse-applicative >= 0.14.3.0 && <= 0.15.1.0, - parsec >= 3.1.13.0 && < 4, - process >= 1.6.5.0 && < 2, - split >= 0.2.3.3 && < 0.3, +@@ -58,7 +58,7 @@ common common-options + containers >= 0.6.0.1 && < 0.7, + json >= 0.10 && < 0.11, + optparse-applicative >= 0.15.1.0 && < 0.16, +- relude >= 0.7 && < 0.8, ++ relude, + text >= 1.2.3.1 && < 2, + avh4-lib, + elm-format-lib diff --git a/devel/elm-format/files/patch-markdown_Cheapskate_ParserCombinators.hs b/devel/elm-format/files/patch-markdown_Cheapskate_ParserCombinators.hs deleted file mode 100644 index fa3b9f158403..000000000000 --- a/devel/elm-format/files/patch-markdown_Cheapskate_ParserCombinators.hs +++ /dev/null @@ -1,32 +0,0 @@ ---- markdown/Cheapskate/ParserCombinators.hs.orig 2020-02-25 17:08:42 UTC -+++ markdown/Cheapskate/ParserCombinators.hs -@@ -1,3 +1,5 @@ -+{-# LANGUAGE CPP #-} -+{- Patch from https://github.com/avh4/elm-format/pull/640/ -} - module Cheapskate.ParserCombinators ( - Position(..) - , Parser -@@ -37,6 +39,7 @@ import qualified Data.Text as T - import Control.Monad - import Control.Applicative - import qualified Data.Set as Set -+import qualified Control.Monad.Fail as Fail - - data Position = Position { line :: Int, column :: Int } - deriving (Ord, Eq) -@@ -107,9 +110,14 @@ instance Alternative Parser where - {-# INLINE empty #-} - {-# INLINE (<|>) #-} - -+instance Fail.MonadFail Parser where -+ fail e = Parser $ \st -> Left $ ParseError (position st) e -+ - instance Monad Parser where - return x = Parser $ \st -> Right (st, x) -- fail e = Parser $ \st -> Left $ ParseError (position st) e -+#if !MIN_VERSION_base(4,13,0) -+ fail = Fail.fail -+#endif - p >>= g = Parser $ \st -> - case evalParser p st of - Left e -> Left e diff --git a/devel/elm-format/files/patch-src_ElmFormat_Version.hs b/devel/elm-format/files/patch-src_ElmFormat_Version.hs deleted file mode 100644 index 117b50c58ba8..000000000000 --- a/devel/elm-format/files/patch-src_ElmFormat_Version.hs +++ /dev/null @@ -1,15 +0,0 @@ ---- src/ElmFormat/Version.hs.orig 2019-07-15 11:58:38 UTC -+++ src/ElmFormat/Version.hs -@@ -1,11 +1,9 @@ - module ElmFormat.Version (asString, experimental) where - --import qualified Build_elm_format - -- - asString :: String - asString = -- Build_elm_format.gitDescribe -+ "%%PORTVERSION%%" - - - experimental :: Maybe String