Skip to content

Commit

Permalink
Uses/cabal.mk: Rework MASTER_SITES and DISTFILES handling.
Browse files Browse the repository at this point in the history 
This change removes duplicated entries from MASTER_SITES and DISTFILES
variables. Now the MASTER_SITES variable will contain single Hackage URL without
any group for the simplest case and with :_cabal_mk_hackage group in nodefault
case.

This change opens a path to using non-Hackage Cabal repositories
(needed for Cardano) and pulling in .cabal revisions without using patches.

Unfortunately, this change results in a large churn in Haskell ports distinfos.
To make this churn less useless, refresh all Haskell dependencies in all ports.
  • Loading branch information
@arrowd
arrowd committed Nov 20, 2022
1 parent d72b566 commit 2fca709
Show file tree
Hide file tree
Showing 90 changed files with 4,602 additions and 4,187 deletions.
17 changes: 9 additions & 8 deletions Mk/Uses/cabal.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,13 @@ _hackage_is_default= yes
_hackage_is_default= no
. endif

MASTER_SITES+= https://hackage.haskell.org/package/${_hackage_group} \
http://hackage.haskell.org/package/${_hackage_group}

. if ${_hackage_is_default} == yes
MASTER_SITES= https://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ \
http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/
DISTFILES+= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX}
DISTFILES+= ${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX}
. else
_hackage_group= :cabal_mk_hackage
. endif

_USES_extract= 701:cabal-post-extract
Expand All @@ -136,12 +139,10 @@ BUILD_TARGET?= ${CABAL_EXECUTABLES:S/^/exe:&/}
_use_cabal= ${USE_CABAL:O:u}

. for package in ${_use_cabal}
. for pkg_group pkg_name xrev in ${package:C/[\.-]//g} ${package:C/_[0-9]+//} x${package:C/[^_]*//:S/_//}
MASTER_SITES+= https://hackage.haskell.org/package/:${pkg_group} \
http://hackage.haskell.org/package/:${pkg_group}
DISTFILES+= ${pkg_name}/${pkg_name}${CABAL_EXTRACT_SUFX}:${pkg_group}
. for pkg_name xrev in ${package:C/_[0-9]+//} x${package:C/[^_]*//:S/_//}
DISTFILES+= ${pkg_name}/${pkg_name}${CABAL_EXTRACT_SUFX}${_hackage_group}
. if ${xrev} != "x"
DISTFILES+= ${pkg_name}/revision/${xrev:S/x//}.cabal:${pkg_group}
DISTFILES+= ${pkg_name}/revision/${xrev:S/x//}.cabal${_hackage_group}
. endif
_CABAL_EXTRACT_ONLY+= ${pkg_name}/${pkg_name}${CABAL_EXTRACT_SUFX}
. endfor
Expand Down
57 changes: 30 additions & 27 deletions converters/hs-aeson-pretty/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= aeson-pretty
PORTVERSION= 0.8.9
PORTREVISION= 1
CATEGORIES= converters haskell

MAINTAINER= haskell@FreeBSD.org
Expand All @@ -10,42 +11,44 @@ LICENSE= BSD3CLAUSE

USES= cabal

USE_CABAL= OneTuple-0.3.1_2 \
USE_CABAL= OneTuple-0.3.1_3 \
QuickCheck-2.14.2 \
StateVar-1.2.2 \
aeson-2.0.3.0 \
assoc-1.0.2_2 \
attoparsec-0.14.4_1 \
base-compat-0.12.1 \
base-compat-batteries-0.12.1_2 \
base-orphans-0.8.6 \
bifunctors-5.5.12 \
aeson-2.1.1.0 \
assoc-1.0.2_3 \
attoparsec-0.14.4_2 \
base-compat-0.12.2 \
base-compat-batteries-0.12.2 \
base-orphans-0.8.7 \
bifunctors-5.5.13 \
cmdargs-0.10.21 \
comonad-5.0.8_1 \
contravariant-1.5.5 \
data-fix-0.3.2_2 \
data-fix-0.3.2_3 \
distributive-0.6.2.1_1 \
dlist-1.0 \
hashable-1.4.0.2 \
indexed-traversable-0.1.2_1 \
indexed-traversable-instances-0.1.1 \
integer-logarithms-1.0.3.1_2 \
primitive-0.7.3.0 \
generically-0.1 \
hashable-1.4.1.0 \
indexed-traversable-0.1.2_2 \
indexed-traversable-instances-0.1.1.1 \
integer-logarithms-1.0.3.1_3 \
primitive-0.7.4.0 \
random-1.2.1.1 \
scientific-0.3.7.0_2 \
semialign-1.2.0.1_1 \
scientific-0.3.7.0_3 \
semialign-1.2.0.1_3 \
semigroupoids-5.3.7 \
splitmix-0.1.0.4 \
splitmix-0.1.0.4_1 \
strict-0.4.0.1_4 \
tagged-0.8.6.1_2 \
text-short-0.1.5 \
th-abstraction-0.4.3.0 \
these-1.1.1.1_5 \
time-compat-1.9.6.1_3 \
transformers-compat-0.7.1_1 \
unordered-containers-0.2.19.1 \
uuid-types-1.0.5_2 \
vector-0.12.3.1_1 \
witherable-0.4.2_2
tagged-0.8.6.1_3 \
text-short-0.1.5_1 \
th-abstraction-0.4.5.0 \
these-1.1.1.1_6 \
time-compat-1.9.6.1_4 \
transformers-compat-0.7.2 \
unordered-containers-0.2.19.1_1 \
uuid-types-1.0.5_3 \
vector-0.13.0.0_1 \
vector-stream-0.1.0.0_1 \
witherable-0.4.2_3

.include <bsd.port.mk>
122 changes: 65 additions & 57 deletions converters/hs-aeson-pretty/distinfo
View file

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions converters/hs-aeson-pretty/files/patch-aeson-pretty.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@
cabal-version: 2.0
name: aeson-pretty
version: 0.8.9
+x-revision: 1
+x-revision: 2
license: BSD3
license-file: LICENSE
category: Text, Web, JSON, Pretty Printer
@@ -48,7 +49,7 @@ library
@@ -41,14 +42,14 @@ library
Data.Aeson.Encode.Pretty

build-depends:
- aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0,
+ aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0 || ^>=2.1,
base >= 4.5,
base-compat >= 0.9,
bytestring >= 0.9,
scientific >= 0.3,
vector >= 0.9,
text >= 0.11,
Expand Down
106 changes: 55 additions & 51 deletions converters/hs-dhall-bash/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= dhall-bash
PORTVERSION= 1.0.40
PORTREVISION= 1
CATEGORIES= converters lang haskell

MAINTAINER= malcolm.matalka@acsl.se
Expand All @@ -11,112 +12,115 @@ LICENSE= BSD3CLAUSE
USES= cabal

USE_CABAL= Diff-0.4.1 \
OneTuple-0.3.1_2 \
OneTuple-0.3.1_3 \
Only-0.1_1 \
QuickCheck-2.14.2 \
StateVar-1.2.2 \
aeson-2.0.3.0 \
aeson-pretty-0.8.9_1 \
aeson-2.1.1.0 \
aeson-pretty-0.8.9_2 \
ansi-terminal-0.11.3 \
ansi-wl-pprint-0.6.9_3 \
appar-0.1.8 \
asn1-encoding-0.9.6_2 \
asn1-parse-0.9.5 \
asn1-types-0.3.4 \
assoc-1.0.2_2 \
async-2.2.4_1 \
assoc-1.0.2_3 \
async-2.2.4_2 \
atomic-write-0.2.0.7 \
attoparsec-0.14.4_1 \
base-compat-0.12.1 \
base-compat-batteries-0.12.1_2 \
base-orphans-0.8.6 \
attoparsec-0.14.4_2 \
base-compat-0.12.2 \
base-compat-batteries-0.12.2 \
base-orphans-0.8.7 \
base16-bytestring-1.0.2.0 \
base64-bytestring-1.2.1.0 \
basement-0.0.14 \
bifunctors-5.5.12 \
basement-0.0.15 \
bifunctors-5.5.13 \
blaze-builder-0.4.2.2_1 \
byteorder-1.0.4 \
cabal-doctest-1.0.9_1 \
cabal-doctest-1.0.9_2 \
case-insensitive-1.2.1.0 \
cborg-0.2.7.0_1 \
cborg-json-0.2.4.0 \
cereal-0.5.8.2_1 \
cborg-0.2.8.0_1 \
cborg-json-0.2.5.0_1 \
cereal-0.5.8.3 \
charset-0.3.9 \
cmdargs-0.10.21 \
colour-2.3.6 \
comonad-5.0.8_1 \
connection-0.3.1_1 \
contravariant-1.5.5 \
cookie-0.4.5 \
cryptohash-sha256-0.11.102.1 \
cryptohash-sha256-0.11.102.1_1 \
cryptonite-0.30 \
data-default-class-0.1.2.0 \
data-fix-0.3.2_2 \
dhall-1.41.1_1 \
data-fix-0.3.2_3 \
dhall-1.41.2_3 \
distributive-0.6.2.1_1 \
dlist-1.0 \
dotgen-0.4.3 \
either-5.0.2 \
generically-0.1 \
half-0.3.1 \
hashable-1.4.0.2 \
hashable-1.4.1.0 \
hourglass-0.2.12 \
hsc2hs-0.68.8 \
http-client-0.7.11_1 \
hsc2hs-0.68.8_1 \
http-client-0.7.13.1 \
http-client-tls-0.3.6.1 \
http-types-0.12.3 \
indexed-traversable-0.1.2_1 \
indexed-traversable-instances-0.1.1 \
integer-logarithms-1.0.3.1_2 \
indexed-traversable-0.1.2_2 \
indexed-traversable-instances-0.1.1.1 \
integer-logarithms-1.0.3.1_3 \
iproute-1.7.12 \
lens-family-core-2.1.0 \
megaparsec-9.2.1 \
memory-0.17.0 \
mime-types-0.1.0.9 \
mmorph-1.2.0_2 \
lens-family-core-2.1.2 \
megaparsec-9.2.2 \
memory-0.18.0 \
mime-types-0.1.1.0 \
mmorph-1.2.0_3 \
neat-interpolation-0.5.1.3 \
network-3.1.2.7 \
network-uri-2.6.4.1 \
optparse-applicative-0.17.0.0 \
optparse-generic-1.4.7_2 \
optparse-generic-1.4.8_1 \
parser-combinators-1.3.0 \
parsers-0.12.11 \
pem-0.2.4 \
pretty-simple-4.1.1.0 \
pretty-simple-4.1.2.0 \
prettyprinter-1.7.1 \
prettyprinter-ansi-terminal-1.1.3 \
primitive-0.7.3.0_2 \
primitive-0.7.4.0 \
profunctors-5.6.2_2 \
random-1.2.1.1 \
repline-0.4.2.0 \
scientific-0.3.7.0_2 \
semialign-1.2.0.1_1 \
scientific-0.3.7.0_3 \
semialign-1.2.0.1_3 \
semigroupoids-5.3.7 \
serialise-0.2.5.0 \
serialise-0.2.6.0_1 \
shell-escape-0.2.0 \
socks-0.6.1 \
splitmix-0.1.0.4 \
streaming-commons-0.2.2.4 \
splitmix-0.1.0.4_1 \
streaming-commons-0.2.2.5 \
strict-0.4.0.1_4 \
system-filepath-0.4.14_1 \
tagged-0.8.6.1_2 \
tagged-0.8.6.1_3 \
temporary-1.3 \
text-manipulate-0.3.1.0 \
text-short-0.1.5 \
th-abstraction-0.4.3.0 \
th-compat-0.1.3_1 \
th-lift-0.8.2_1 \
th-lift-instances-0.1.19 \
these-1.1.1.1_5 \
time-compat-1.9.6.1_3 \
text-short-0.1.5_1 \
th-abstraction-0.4.5.0 \
th-compat-0.1.4 \
th-lift-0.8.2_2 \
th-lift-instances-0.1.20 \
these-1.1.1.1_6 \
time-compat-1.9.6.1_4 \
tls-1.6.0 \
transformers-compat-0.7.1_1 \
unix-compat-0.6 \
unordered-containers-0.2.19.1 \
transformers-compat-0.7.2 \
unix-compat-0.6_1 \
unordered-containers-0.2.19.1_1 \
uri-encode-1.5.0.7_2 \
utf8-string-1.0.2 \
uuid-types-1.0.5_2 \
vector-0.12.3.1_2 \
uuid-types-1.0.5_3 \
vector-0.13.0.0_1 \
vector-stream-0.1.0.0_1 \
void-0.7.3 \
witherable-0.4.2_2 \
witherable-0.4.2_3 \
x509-1.7.7 \
x509-store-1.6.9 \
x509-system-1.6.7 \
Expand Down
Loading

0 comments on commit 2fca709

Please sign in to comment.