From aaacbe9278b210c6851a58bbf2b857e9dc794dd6 Mon Sep 17 00:00:00 2001 From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org> Date: Sun, 26 May 2024 13:48:10 +0000 Subject: [PATCH] community/darcs: upgrade to 2.18.3 https://hackage.haskell.org/package/darcs-2.18.3/src/CHANGELOG.md --- community/darcs/APKBUILD | 40 ++++++--- community/darcs/cabal.project.freeze | 117 +++++++++++---------------- 2 files changed, 75 insertions(+), 82 deletions(-) diff --git a/community/darcs/APKBUILD b/community/darcs/APKBUILD index dd067e16355c..a6270b7f8b95 100644 --- a/community/darcs/APKBUILD +++ b/community/darcs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: gay <gay@disroot.org> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=darcs -pkgver=2.18.2 +pkgver=2.18.3 pkgrel=0 pkgdesc="Patch-based revision control system" url="https://darcs.net/" @@ -16,25 +16,45 @@ source="https://hackage.haskell.org/package/darcs-$pkgver/darcs-$pkgver.tar.gz " # Directory where cabal files are stored. -export CABAL_DIR="$srcdir/dist" +export CABAL_DIR="${CABAL_DIR:-"$srcdir/dist"}" # Needed to fix build on aarch64. export PATH="$PATH:/usr/lib/llvm15/bin" cabal_update() { - cd $builddir - cabal v2-update + local repo="hackage.haskell.org" + + # Default config uses HTTP, change it to HTTPS. + [ -f "$CABAL_DIR"/config ] || { + cabal user-config init + cabal user-config update -a \ + "repository $repo {url: https://$repo/}" + } + + [ -d "$builddir" ] || abuild unpack + msg "Freezing $pkgname dependencies" + + # Resolve deps and generate fresh cabal.project.freeze with version constraints. ( - cd "$builddir" + cd "$builddir" || { + error 'Is $builddir set correctly?' + return 1 + } + cabal v2-update cabal v2-freeze --shadow-installed-packages - mv cabal.project.freeze "$startdir/" + + mv -v cabal.project.freeze "$startdir"/ ) + + if ! abuild checksum; then + die "Failed to update checksum, run 'abuild checksum' manually" + fi } prepare() { default_prepare - ln -sf "$srcdir/cabal.project.freeze" \ - "$builddir/cabal.project.freeze" + + ln -svf "$srcdir"/cabal.project.freeze "$builddir"/ } build() { @@ -57,6 +77,6 @@ package() { } sha512sums=" -f776b3b2efd73e9515a99bf154468aa4aef925d20c9de564a78f7a19bf302db31c6e4cdbca2c2c700a0d5cde1b62a426159554f543898712b1f603401c534a9c darcs-2.18.2.tar.gz -b177b661b37a907db1af30e6f796a5c2f600bc8b19411b3a741b071a45ee257a2371e160ea7c1cc31b07a288f2aa9966a14318ca1c0c0eede6aa11fe81798de9 cabal.project.freeze +de70b87493ed9776a16d492ca1fb2f7e1a4a46bf3538ebe937adc8b548b1b4519cb7a737edd13b92253c797a04765832b37c9ef6d552705db6980454429da3d6 darcs-2.18.3.tar.gz +aa94626e596cc0935d14baa874fac5430cf90f3967e5d5c43214151118cdefae8430ac523ef13e084fd1688b25b4bd825fa459a53d88f63b54be43f140a7fb13 cabal.project.freeze " diff --git a/community/darcs/cabal.project.freeze b/community/darcs/cabal.project.freeze index c6677adac2ad..3551ee3d0332 100644 --- a/community/darcs/cabal.project.freeze +++ b/community/darcs/cabal.project.freeze @@ -1,33 +1,26 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.10.2.0, - any.Cabal-syntax ==3.10.2.0, - any.FindBin ==0.0.5, - any.HUnit ==1.6.2.0, - any.OneTuple ==0.4.1.1, - any.QuickCheck ==2.14.3, +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, + any.OneTuple ==0.4.2, + any.QuickCheck ==2.15, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, - any.aeson ==2.2.1.0, + any.aeson ==2.2.2.0, aeson +ordered-keymap, - any.ansi-terminal ==1.1, - ansi-terminal -example, - any.ansi-terminal-types ==1.1, - any.ansi-wl-pprint ==1.0.2, - ansi-wl-pprint -example, any.appar ==0.1.8, any.array ==0.5.6.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, - any.assoc ==1.1, - assoc +tagged, + any.assoc ==1.1.1, + assoc -tagged, any.async ==2.2.5, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, - any.attoparsec-aeson ==2.2.0.1, + any.attoparsec-aeson ==2.2.2.0, any.base ==4.19.1.0, - any.base-orphans ==0.9.1, + any.base-orphans ==0.9.2, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, any.basement ==0.0.16, @@ -37,29 +30,28 @@ constraints: any.Cabal ==3.10.2.0, any.bitvec ==1.1.5.0, bitvec +simd, any.blaze-builder ==0.4.2.3, - any.boring ==0.2.1, + any.boring ==0.2.2, boring +tagged, any.byteorder ==1.0.4, any.bytestring ==0.12.1.0, - any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, + any.cborg ==0.2.10.0, + cborg +optimize-gmp, any.cereal ==0.5.8.3, cereal -bytestring-builder, - any.cmdargs ==0.10.22, - cmdargs +quotation -testprog, - any.colour ==2.3.6, + any.character-ps ==0.1, any.comonad ==5.0.8, comonad +containers +distributive +indexed-traversable, any.conduit ==1.3.5, any.conduit-extra ==1.3.6, - any.constraints ==0.14, + any.constraints ==0.14.2, any.containers ==0.6.8, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, any.cookie ==0.5.0, - any.crypton ==0.34, + any.crypton ==1.0.0, crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, - any.crypton-connection ==0.3.2, + any.crypton-connection ==0.4.0, any.crypton-x509 ==1.7.6, any.crypton-x509-store ==1.6.9, any.crypton-x509-system ==1.6.7, @@ -68,18 +60,18 @@ constraints: any.Cabal ==3.10.2.0, cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, darcs +executable -rts -static +terminfo +threaded -warn-as-error, any.data-default-class ==0.1.2.0, - any.data-fix ==0.3.2, + any.data-fix ==0.3.3, any.data-ordlist ==0.4.7.0, any.deepseq ==1.5.0.0, any.digest ==0.0.2.1, digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval -pkg-config, - any.directory ==1.3.8.1, + any.directory ==1.3.8.5, + directory -os-string, any.distributive ==0.6.2.1, distributive +semigroups +tagged, any.dlist ==1.0, dlist -werror, any.exceptions ==0.10.7, - any.extensible-exceptions ==0.1.1.4, any.fgl ==5.8.2.0, fgl +containers042, any.filepath ==1.4.200.1, @@ -89,10 +81,11 @@ constraints: any.Cabal ==3.10.2.0, any.ghc-bignum ==1.3, any.ghc-boot-th ==9.8.2, any.ghc-prim ==0.11.0, + any.half ==0.3.1, any.hashable ==1.4.4.0, hashable +integer-gmp -random-initial-seed, any.haskeline ==0.8.2.1, - any.hostname ==1.0, + haskeline +examples +terminfo, any.hourglass ==0.2.12, any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, @@ -103,55 +96,47 @@ constraints: any.Cabal ==3.10.2.0, any.http-conduit ==2.3.8.3, http-conduit +aeson, any.http-types ==0.12.4, - any.indexed-traversable ==0.1.3, - any.indexed-traversable-instances ==0.1.1.2, - any.integer-conversion ==0.1.0.1, + any.indexed-traversable ==0.1.4, + any.indexed-traversable-instances ==0.1.2, + any.integer-conversion ==0.1.1, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, any.iproute ==1.7.12, - any.leancheck ==1.0.2, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, any.mime-types ==0.1.2.0, any.mmap ==0.5.9, mmap -mmaptest, - any.monad-control ==1.0.3.1, any.mono-traversable ==1.0.17.0, any.mtl ==2.3.1, - any.network ==3.1.4.0, + any.network ==3.2.0.0, network -devel, any.network-uri ==2.6.4.2, any.old-locale ==1.0.0.7, any.old-time ==1.1.0.4, - any.os-string ==2.0.2, + any.os-string ==2.0.3, any.parsec ==3.1.17.0, any.pem ==0.2.4, any.pretty ==1.1.3.6, - any.prettyprinter ==1.7.1, - prettyprinter -buildreadme +text, - any.prettyprinter-ansi-terminal ==1.1.3, - any.prettyprinter-compat-ansi-wl-pprint ==1.0.2, any.primitive ==0.9.0.0, - any.process ==1.6.18.0, - any.quickcheck-instances ==0.3.30, - quickcheck-instances -bytestring-builder, + any.process ==1.6.20.0, any.random ==1.2.1.2, any.regex-applicative ==0.3.4, any.regex-base ==0.94.0.2, - any.regex-posix ==0.96.0.1, - regex-posix -_regex-posix-clib, any.regex-tdfa ==1.3.2.2, regex-tdfa +doctest -force-o2, any.resourcet ==1.3.0, any.rts ==1.0.2, any.safe ==0.3.21, - any.scientific ==0.3.7.0, - scientific -bytestring-builder -integer-simple, - any.semialign ==1.3, + any.scientific ==0.3.8.0, + scientific -integer-simple, + any.semialign ==1.3.1, semialign +semigroupoids, - any.semigroupoids ==6.0.0.1, + any.semigroupoids ==6.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.serialise ==0.2.6.1, + serialise +newtime15, any.socks ==0.6.1, any.split ==0.2.5, any.splitmix ==0.1.0.5, @@ -161,8 +146,6 @@ constraints: any.Cabal ==3.10.2.0, streaming-commons -use-bytestring-builder, any.strict ==0.5, any.strict-identity ==0.1.0.0, - any.system-fileio ==0.3.16.4, - any.system-filepath ==0.4.14, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tar ==0.6.2.0, @@ -170,29 +153,20 @@ constraints: any.Cabal ==3.10.2.0, any.temporary ==1.3, any.terminal-size ==0.3.4, any.terminfo ==0.4.1.6, - any.test-framework ==0.8.2.0, - any.test-framework-hunit ==0.3.0.2, - test-framework-hunit -base3 +base4, - any.test-framework-leancheck ==0.0.4, - any.test-framework-quickcheck2 ==0.3.0.5, any.text ==2.1.1, - any.text-iso8601 ==0.1, - any.text-short ==0.1.5, + any.text-iso8601 ==0.1.1, + any.text-short ==0.1.6, text-short -asserts, - any.th-abstraction ==0.6.0.0, + any.th-abstraction ==0.7.0.0, any.th-compat ==0.1.5, - any.these ==1.2, + any.these ==1.2.1, any.time ==1.12.2, - any.time-compat ==1.9.6.1, - time-compat -old-locale, - any.tls ==1.9.0, - tls +compat -hans +network, + any.time-compat ==1.9.7, + any.tls ==2.0.6, + tls -devel, any.transformers ==0.6.1.0, - any.transformers-base ==0.4.6, - transformers-base +orphaninstances, any.transformers-compat ==0.7.2, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, - any.type-equality ==1, any.typed-process ==0.2.11.1, any.unix ==2.8.4.0, any.unix-compat ==0.7.1, @@ -202,16 +176,15 @@ constraints: any.Cabal ==3.10.2.0, any.unordered-containers ==0.2.20, unordered-containers -debug, any.utf8-string ==1.0.2, - any.uuid-types ==1.0.5.1, + any.uuid-types ==1.0.6, any.vector ==0.13.1.0, vector +boundschecks -internalchecks -unsafechecks -wall, - any.vector-algorithms ==0.9.0.1, + any.vector-algorithms ==0.9.0.2, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-stream ==0.1.0.1, - any.witherable ==0.4.2, - any.xml ==1.3.14, + any.witherable ==0.5, any.zip-archive ==0.4.3.2, zip-archive -executable, - any.zlib ==0.7.0.0, + any.zlib ==0.7.1.0, zlib -bundled-c-zlib +non-blocking-ffi -pkg-config -index-state: hackage.haskell.org 2024-04-12T15:34:42Z +index-state: hackage.haskell.org 2024-05-26T13:05:50Z -- GitLab