Attachment #251122 for bug #279440

View | Details | Raw Unified | Return to bug 279440
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/devel/hs-spago/Makefile (-2 / +6 lines)
1	PORTNAME= spago	1	PORTNAME= spago
2	DISTVERSION= 0.20.9	2	DISTVERSION= 0.21.0
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/docs-search-app.js?dummy=/:dsa11 \	4	MASTER_SITES= https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/docs-search-app.js?dummy=/:dsa11 \
5	https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/purescript-docs-search?dummy=/:pds11 \	5	https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/purescript-docs-search?dummy=/:pds11 \
Lines 13-21 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} Link Here
13		13
14	MAINTAINER= haskell@FreeBSD.org	14	MAINTAINER= haskell@FreeBSD.org
15	COMMENT= PureScript package manager and build tool	15	COMMENT= PureScript package manager and build tool
16	WWW= https://github.com/spacchetti/spago	16	WWW= https://github.com/spacchetti/spago/
17		17
18	LICENSE= BSD3CLAUSE	18	LICENSE= BSD3CLAUSE
		19	LICENSE_FILE= ${WRKSRC}/LICENSE
19		20
20	BUILD_DEPENDS= ghc-9.2.8:lang/ghc92	21	BUILD_DEPENDS= ghc-9.2.8:lang/ghc92
21	RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss	22	RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss
Lines 110-115 USE_CABAL= Diff-0.4.1 \ Link Here
110	kan-extensions-5.2.4 \	111	kan-extensions-5.2.4 \
111	keys-3.12.3_2 \	112	keys-3.12.3_2 \
112	lens-family-core-2.1.0 \	113	lens-family-core-2.1.0 \
		114	libyaml-0.1.4 \
		115	libyaml-clib-0.2.5 \
113	lifted-base-0.2.3.12 \	116	lifted-base-0.2.3.12 \
114	managed-1.0.9_1 \	117	managed-1.0.9_1 \
115	megaparsec-9.2.1 \	118	megaparsec-9.2.1 \
Lines 199-204 USE_CABAL= Diff-0.4.1 \ Link Here
199	x509-store-1.6.9 \	202	x509-store-1.6.9 \
200	x509-system-1.6.7 \	203	x509-system-1.6.7 \
201	x509-validation-1.6.12 \	204	x509-validation-1.6.12 \
		205	yaml-0.11.11.2_2 \
202	zlib-0.6.3.0	206	zlib-0.6.3.0
203		207
204	post-extract:	208	post-extract:

Lines 1-4 Link Here

(-)b/devel/hs-spago/distinfo (-3 / +11 lines)
1	TIMESTAMP = 1656179479	1	TIMESTAMP = 1717164139
2	SHA256 (cabal/docs-search-app-0.0.11.js) = 0254c9bd09924352f1571642bf0da588aa9bdb1f343f16d464263dd79b7e169f	2	SHA256 (cabal/docs-search-app-0.0.11.js) = 0254c9bd09924352f1571642bf0da588aa9bdb1f343f16d464263dd79b7e169f
3	SIZE (cabal/docs-search-app-0.0.11.js) = 462590	3	SIZE (cabal/docs-search-app-0.0.11.js) = 462590
4	SHA256 (cabal/purescript-docs-search-0.0.11) = 06dfcb9b84408527a2980802108fae6a5260a522013f67d0ef7e83946abe4dc2	4	SHA256 (cabal/purescript-docs-search-0.0.11) = 06dfcb9b84408527a2980802108fae6a5260a522013f67d0ef7e83946abe4dc2
Lines 235-240 SHA256 (cabal/keys-3.12.3/revision/2.cabal) = 97caf71bc3adc631cff437c4de549d3552 Link Here
235	SIZE (cabal/keys-3.12.3/revision/2.cabal) = 2321	235	SIZE (cabal/keys-3.12.3/revision/2.cabal) = 2321
236	SHA256 (cabal/lens-family-core-2.1.0/lens-family-core-2.1.0.tar.gz) = 7b6c79107dc54db8317ace02fb6b158e6694d6fdcb3f34bdf65cf6489ca85fca	236	SHA256 (cabal/lens-family-core-2.1.0/lens-family-core-2.1.0.tar.gz) = 7b6c79107dc54db8317ace02fb6b158e6694d6fdcb3f34bdf65cf6489ca85fca
237	SIZE (cabal/lens-family-core-2.1.0/lens-family-core-2.1.0.tar.gz) = 17960	237	SIZE (cabal/lens-family-core-2.1.0/lens-family-core-2.1.0.tar.gz) = 17960
		238	SHA256 (cabal/libyaml-0.1.4/libyaml-0.1.4.tar.gz) = d6297ec9b1ebb4e4b580a4357d840d08a6f53e13a10c0c53ee74b973bba6fa13
		239	SIZE (cabal/libyaml-0.1.4/libyaml-0.1.4.tar.gz) = 9592
		240	SHA256 (cabal/libyaml-clib-0.2.5/libyaml-clib-0.2.5.tar.gz) = 04526bc54e5fcf471c2bd22854e6b519e162a6e3d654e866cd8862103c725149
		241	SIZE (cabal/libyaml-clib-0.2.5/libyaml-clib-0.2.5.tar.gz) = 55500
238	SHA256 (cabal/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz) = c134a95f56750aae806e38957bb03c59627cda16034af9e00a02b699474317c5	242	SHA256 (cabal/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz) = c134a95f56750aae806e38957bb03c59627cda16034af9e00a02b699474317c5
239	SIZE (cabal/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz) = 11700	243	SIZE (cabal/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz) = 11700
240	SHA256 (cabal/managed-1.0.9/managed-1.0.9.tar.gz) = 4d476da3b6e7a14220f2e3a764e5d43bf339e89a3dc46a7bdfdeb3856a54a86f	244	SHA256 (cabal/managed-1.0.9/managed-1.0.9.tar.gz) = 4d476da3b6e7a14220f2e3a764e5d43bf339e89a3dc46a7bdfdeb3856a54a86f
Lines 467-473 SHA256 (cabal/x509-system-1.6.7/x509-system-1.6.7.tar.gz) = 68fc1ffd9b33fc858869 Link Here
467	SIZE (cabal/x509-system-1.6.7/x509-system-1.6.7.tar.gz) = 3438	471	SIZE (cabal/x509-system-1.6.7/x509-system-1.6.7.tar.gz) = 3438
468	SHA256 (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 0d8e44e199332b22df3e7c19d21b1a79f237fde9a3abf23bef9e7c4991d0f1c8	472	SHA256 (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 0d8e44e199332b22df3e7c19d21b1a79f237fde9a3abf23bef9e7c4991d0f1c8
469	SIZE (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 19733	473	SIZE (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 19733
		474	SHA256 (cabal/yaml-0.11.11.2/yaml-0.11.11.2.tar.gz) = ee74923ee5b0fef74413c58aaa20ea59baf5d29d256a62fb47cc279570d9dc2f
		475	SIZE (cabal/yaml-0.11.11.2/yaml-0.11.11.2.tar.gz) = 31926
		476	SHA256 (cabal/yaml-0.11.11.2/revision/2.cabal) = 6f0a1859e0fb3068e50dbc7fe9bf9a26847741bc24344e35e16a03711a18f88d
		477	SIZE (cabal/yaml-0.11.11.2/revision/2.cabal) = 5178
470	SHA256 (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da	478	SHA256 (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da
471	SIZE (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 369595	479	SIZE (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 369595
472	SHA256 (cabal/purescript-spago-0.20.9_GH0.tar.gz) = 4e0ac70ce37a9bb7679ef280e62b61b21c9ff66e0ba335d9dae540dcde364c39	480	SHA256 (cabal/purescript-spago-0.21.0_GH0.tar.gz) = 0ae1b042010c4d1ffb3865ba0cf67beea741a40c724065dc4056367964b6f4ab
473	SIZE (cabal/purescript-spago-0.20.9_GH0.tar.gz) = 136020	481	SIZE (cabal/purescript-spago-0.21.0_GH0.tar.gz) = 207729




--- src/Spago/Bower.hs.orig	2022-05-03 16:26:05 UTC
+++ src/Spago/Bower.hs
@@ -9,7 +9,7 @@ import qualified Data.Aeson.Encode.Pretty   as Pretty
 
 import qualified Data.Aeson                 as Aeson
 import qualified Data.Aeson.Encode.Pretty   as Pretty
-import qualified Data.HashMap.Strict        as HashMap
+import qualified Data.Aeson.KeyMap          as KeyMap
 import qualified Data.Text                  as Text
 import qualified System.Info
 import qualified Turtle
@@ -109,7 +109,7 @@ mkBowerVersion packageName version (Repo repo) = do
       Just (Object obj) -> pure obj
       _ -> die [ display $ "Unable to decode output from `bower " <> Text.intercalate " " args <> "`: ", display out ]
 
-    if HashMap.member "version" info
+    if KeyMap.member "version" info
       then pure $ Bower.VersionRange $ "^" <> version
       else pure $ Bower.VersionRange $ repo <> "#" <> version
 

Lines 1-3 Link Here

(-)b/devel/hs-spago/pkg-descr (-3 / +2 lines)
1	Spago is a PureScript package manager and build tool powered by Dhall and	1	Spago is a PureScript package manager and build tool powered by Dhall and
2	package-sets, a curated list of PureScript packages. Spago focuses on great UX,	2	package-sets, a curated list of PureScript packages. Spago focuses on
3	assuring minimal dependencies and reproducible builds.	3	great UX, assuring minimal dependencies and reproducible builds.
4	-

Return to bug 279440

Removed Link Here

(-)a/devel/hs-spago/files/patch-src_Spago_Bower.hs (-20 lines)
1	--- src/Spago/Bower.hs.orig 2022-05-03 16:26:05 UTC
2	+++ src/Spago/Bower.hs
3	@@ -9,7 +9,7 @@ import qualified Data.Aeson.Encode.Pretty as Pretty
4
5	import qualified Data.Aeson as Aeson
6	import qualified Data.Aeson.Encode.Pretty as Pretty
7	-import qualified Data.HashMap.Strict as HashMap
8	+import qualified Data.Aeson.KeyMap as KeyMap
9	import qualified Data.Text as Text
10	import qualified System.Info
11	import qualified Turtle
12	@@ -109,7 +109,7 @@ mkBowerVersion packageName version (Repo repo) = do
13	Just (Object obj) -> pure obj
14	_ -> die [ display $ "Unable to decode output from `bower " <> Text.intercalate " " args <> "`: ", display out ]
15
16	- if HashMap.member "version" info
17	+ if KeyMap.member "version" info
18	then pure $ Bower.VersionRange $ "^" <> version
19	else pure $ Bower.VersionRange $ repo <> "#" <> version
20