From nobody Thu Jul 07 10:25:11 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 D084112ADEAC; Thu, 7 Jul 2022 10:25:14 +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 4Ldsx35qwbz3Jdk; Thu, 7 Jul 2022 10:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657189513; 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=XMwdkERG6GFB1fr7jgmSJ+b9twE/IV0h8xa2Z/QIWso=; b=NJxGC/Gd6aR+vtRe1RLVUceRTEWZr9H9/qaYuO+PIk6cxB7i4B+K+VBpp0XkbRtTzLtwX/ ry9CMZs/J4rNzuMs3v9niOtvIEnB0aldc+EEQUyAb12Xi6iBGgbDi9kA2cN7O3Q2vPdkJh Uq9oEnz6eM9k39SkzCixpqSMBCbcNO/Ut1Zfk3dpIar8zqb13TiBuk+CocFS33uZ7SX5Lw i7Gw/D0flQHJZaMhuXRTlbfX4TwdwkZSB4AsOGelFpd4P1F/Tl/CW56uuE2qWeDyETcI8h cvWCn5ZetTBPRklLDU3ZvdSZRYozYLNM53QYb7GpVFtM0zukqIbuoNOmeYXJgA== 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 4Ldsx34hWpzff6; Thu, 7 Jul 2022 10:25:11 +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 267APBuO095144; Thu, 7 Jul 2022 10:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267APB7p095143; Thu, 7 Jul 2022 10:25:11 GMT (envelope-from git) Date: Thu, 7 Jul 2022 10:25:11 GMT Message-Id: <202207071025.267APB7p095143@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: 95bc4ab899ab - main - devel/hs-ormolu: Fix build after GHC update. 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: 95bc4ab899ab3e4fd705d5224fa82d1fbb435a72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657189513; 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=XMwdkERG6GFB1fr7jgmSJ+b9twE/IV0h8xa2Z/QIWso=; b=GPEeyKrp2m7bTRZlPUeUUXLG22WjqAyImJUb3RGwA4Rd5LTpLE5IGEr2UrCNbfFMgU7mJh yc/ZZINbK3GJIbpR01qJgTe6fXdWARDMplKgbVIAgivoEVMvrB8f78bTAxnyupucOWJyvY gjNJsTzwzPuollRYYQW0mNrxy90wNbxO50YcFkv6BFbewDfENphpHEDcIftrX1pSK5dN40 wa86SF+xwdHYVf4aQbpW6rI7dCvCStTWZsJED7coPpNCIMqOoKAOIhNQvaNBGv/HWjmPbG bo2O03aakzbMPUG4Vfi3WiryRDDPrGei+ohcO5S1UA3IY2KeuYLLWa5c82w2Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657189513; a=rsa-sha256; cv=none; b=SlSgtPL3qBJv/H50No2BbR4hQeRrjgoj+VwocTnS/hM2X9gzZTYK85C3mIYAFoNT8l5Ovc oUYjsmkqTwRH3RPPf9sYCXYH6uLVWTNiN8gCU/OMcXyJYB6cjEaLoDV9Qz3UgLmMc5XExY LAdBnjPh4O2MiBux6Q4a7uq5/8dXcmcGzfgLVmZsGPSda09bXwi1NAXlh+etjm3JCxyo9V V3DLleAD3P9Tl34NlFL/despw3HexPxsT7gI1izK+EpiNbIlEwCx28Bs0NjlsoI2pb3JDS GqMPxHjiqHV91G5k9V7LCwqLtu5Q8skwTQu/m5MjRbhFfJVm1F6/Y0UUSuWyxw== 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=95bc4ab899ab3e4fd705d5224fa82d1fbb435a72 commit 95bc4ab899ab3e4fd705d5224fa82d1fbb435a72 Author: Gleb Popov AuthorDate: 2022-05-09 13:25:18 +0000 Commit: Gleb Popov CommitDate: 2022-07-07 10:24:31 +0000 devel/hs-ormolu: Fix build after GHC update. --- devel/hs-ormolu/Makefile | 17 +++++++------- devel/hs-ormolu/distinfo | 40 +++++++++++++++----------------- devel/hs-ormolu/files/patch-ormolu.cabal | 40 ++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 30 deletions(-) diff --git a/devel/hs-ormolu/Makefile b/devel/hs-ormolu/Makefile index e0868cc4c6ac..04f8a4ab61f0 100644 --- a/devel/hs-ormolu/Makefile +++ b/devel/hs-ormolu/Makefile @@ -10,19 +10,18 @@ LICENSE= BSD3CLAUSE USES= cabal -USE_CABAL= Cabal-3.6.0.0 \ - Diff-0.4.0 \ - alex-3.2.6 \ - ansi-terminal-0.11 \ +USE_CABAL= Diff-0.4.1 \ + alex-3.2.7.1 \ + ansi-terminal-0.11.3 \ ansi-wl-pprint-0.6.9_3 \ - base-compat-0.11.2_1 \ + base-compat-0.12.1 \ colour-2.3.6 \ dlist-1.0 \ - ghc-lib-parser-9.2.1.20211101 \ + ghc-lib-parser-9.2.2.20220307 \ gitrev-1.3.1 \ - happy-1.20.0 \ - optparse-applicative-0.16.1.0_2 \ + happy-1.20.0_1 \ + optparse-applicative-0.17.0.0 \ syb-0.7.2.1 \ - transformers-compat-0.7 + transformers-compat-0.7.1_1 .include diff --git a/devel/hs-ormolu/distinfo b/devel/hs-ormolu/distinfo index 781ee570044b..a09d49a68f93 100644 --- a/devel/hs-ormolu/distinfo +++ b/devel/hs-ormolu/distinfo @@ -1,37 +1,35 @@ -TIMESTAMP = 1639316738 +TIMESTAMP = 1652102014 SHA256 (cabal/ormolu-0.4.0.0.tar.gz) = 4902ff5472398620b8c8fe363773a3aa4d111d68f20ed125e72f0ae5935b91aa SIZE (cabal/ormolu-0.4.0.0.tar.gz) = 142052 -SHA256 (cabal/Cabal-3.6.0.0/Cabal-3.6.0.0.tar.gz) = 1bb6df5ab7a67bf942a0137fbd182dea9fc8bb0850631725676486ead28d7e76 -SIZE (cabal/Cabal-3.6.0.0/Cabal-3.6.0.0.tar.gz) = 607718 -SHA256 (cabal/Diff-0.4.0/Diff-0.4.0.tar.gz) = 7290ac098ad8b4748b9c10e494cc85ba54af688226ae69a465aa7b4c73f149c7 -SIZE (cabal/Diff-0.4.0/Diff-0.4.0.tar.gz) = 8065 -SHA256 (cabal/alex-3.2.6/alex-3.2.6.tar.gz) = 91aa08c1d3312125fbf4284815189299bbb0be34421ab963b1f2ae06eccc5410 -SIZE (cabal/alex-3.2.6/alex-3.2.6.tar.gz) = 108832 -SHA256 (cabal/ansi-terminal-0.11/ansi-terminal-0.11.tar.gz) = c6611b9e51add41db3f79eac30066c06b33a6ca2a09e586b4b361d7f98303793 -SIZE (cabal/ansi-terminal-0.11/ansi-terminal-0.11.tar.gz) = 36074 +SHA256 (cabal/Diff-0.4.1/Diff-0.4.1.tar.gz) = fd5e4aaac7219bcbb14834fb8580ebe0aae905958d0ad74f5338ea290b372670 +SIZE (cabal/Diff-0.4.1/Diff-0.4.1.tar.gz) = 8759 +SHA256 (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec +SIZE (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 108229 +SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b +SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868 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/base-compat-0.11.2/base-compat-0.11.2.tar.gz) = 53a6b5145442fba5a4bad6db2bcdede17f164642b48bc39b95015422a39adbdb -SIZE (cabal/base-compat-0.11.2/base-compat-0.11.2.tar.gz) = 34625 -SHA256 (cabal/base-compat-0.11.2/revision/1.cabal) = 31bfcb04e73c994e46fa1b6136dffbea75d2f6e27a67c493a97095bc53c8db40 -SIZE (cabal/base-compat-0.11.2/revision/1.cabal) = 7449 +SHA256 (cabal/base-compat-0.12.1/base-compat-0.12.1.tar.gz) = fb683cb4041b88cab1d0849f70ebd26b342c734a9ef6f75233c1602d53a015fd +SIZE (cabal/base-compat-0.12.1/base-compat-0.12.1.tar.gz) = 35504 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/dlist-1.0/dlist-1.0.tar.gz) = 173d637328bb173fcc365f30d29ff4a94292a1e0e5558aeb3dfc11de81510115 SIZE (cabal/dlist-1.0/dlist-1.0.tar.gz) = 18667 -SHA256 (cabal/ghc-lib-parser-9.2.1.20211101/ghc-lib-parser-9.2.1.20211101.tar.gz) = 16745eee5e803ef7f062fdec2fed119fee796dace25b166cd5edde4b3fbbb037 -SIZE (cabal/ghc-lib-parser-9.2.1.20211101/ghc-lib-parser-9.2.1.20211101.tar.gz) = 1962161 +SHA256 (cabal/ghc-lib-parser-9.2.2.20220307/ghc-lib-parser-9.2.2.20220307.tar.gz) = 86f4b23dbc245c48d3f159911c221150458e6ea87b6cfa65f7306393639f6b88 +SIZE (cabal/ghc-lib-parser-9.2.2.20220307/ghc-lib-parser-9.2.2.20220307.tar.gz) = 1966945 SHA256 (cabal/gitrev-1.3.1/gitrev-1.3.1.tar.gz) = a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332 SIZE (cabal/gitrev-1.3.1/gitrev-1.3.1.tar.gz) = 3756 SHA256 (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 3b1d3a8f93a2723b554d9f07b2cd136be1a7b2fcab1855b12b7aab5cbac8868c SIZE (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 184515 -SHA256 (cabal/optparse-applicative-0.16.1.0/optparse-applicative-0.16.1.0.tar.gz) = 6205278362f333c52256b9dd3edf5f8fe0f84f00cb9ee000291089f6eaccd69a -SIZE (cabal/optparse-applicative-0.16.1.0/optparse-applicative-0.16.1.0.tar.gz) = 58315 -SHA256 (cabal/optparse-applicative-0.16.1.0/revision/2.cabal) = 418c22ed6a19124d457d96bc66bd22c93ac22fad0c7100fe4972bbb4ac989731 -SIZE (cabal/optparse-applicative-0.16.1.0/revision/2.cabal) = 4982 +SHA256 (cabal/happy-1.20.0/revision/1.cabal) = 5d47dc221a9fe964e36aaaa2e1ab7e8f085a225fd6528d6eff310b92360bbe99 +SIZE (cabal/happy-1.20.0/revision/1.cabal) = 5732 +SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724 +SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409 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/transformers-compat-0.7/transformers-compat-0.7.tar.gz) = a4ad731dd7515ebd7ffd60993dcbd10a4f5bea79daebfc212d7dc580f370a98f -SIZE (cabal/transformers-compat-0.7/transformers-compat-0.7.tar.gz) = 42688 +SHA256 (cabal/transformers-compat-0.7.1/transformers-compat-0.7.1.tar.gz) = ac0b861534c14d3cfd61534f474674e3b634b8decea072ffd4d21f8b59f35080 +SIZE (cabal/transformers-compat-0.7.1/transformers-compat-0.7.1.tar.gz) = 44363 +SHA256 (cabal/transformers-compat-0.7.1/revision/1.cabal) = 873ef500790cae136d14b2e890da1fe4df963e372f21b1671fa3c6cdfb23b10f +SIZE (cabal/transformers-compat-0.7.1/revision/1.cabal) = 5807 diff --git a/devel/hs-ormolu/files/patch-ormolu.cabal b/devel/hs-ormolu/files/patch-ormolu.cabal new file mode 100644 index 000000000000..b2fff18cae5a --- /dev/null +++ b/devel/hs-ormolu/files/patch-ormolu.cabal @@ -0,0 +1,40 @@ +--- ormolu.cabal.orig 2001-09-09 01:46:40 UTC ++++ ormolu.cabal +@@ -1,6 +1,7 @@ version: 0.4.0.0 + cabal-version: 2.4 + name: ormolu + version: 0.4.0.0 ++x-revision: 2 + license: BSD-3-Clause + license-file: LICENSE.md + maintainer: Mark Karpov +@@ -91,7 +92,7 @@ library + ghc-lib-parser >=9.2 && <9.3, + mtl >=2.0 && <3.0, + syb >=0.7 && <0.8, +- text >=0.2 && <1.3, ++ text >=0.2 && <3.0, + filepath >=1.2 && <1.5, + directory ^>=1.3, + Cabal >=3.6 && <3.7 +@@ -116,9 +117,9 @@ executable ormolu + filepath >=1.2 && <1.5, + ghc-lib-parser >=9.2 && <9.3, + gitrev >=1.3 && <1.4, +- optparse-applicative >=0.14 && <0.17, ++ optparse-applicative >=0.14 && <0.18, + ormolu, +- text >=0.2 && <1.3 ++ text >=0.2 && <3.0 + + if flag(dev) + ghc-options: +@@ -153,7 +154,7 @@ test-suite tests + path >=0.6 && <0.10, + path-io >=1.4.2 && <2.0, + temporary ^>=1.3, +- text >=0.2 && <1.3 ++ text >=0.2 && <3.0 + + if flag(dev) + ghc-options: -Wall -Werror