CVS commit: pkgsrc/devel/darcs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/darcs
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Fri, 31 Jan 2025 01:03:47 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Jan 31 01:03:47 UTC 2025

Modified Files:
        pkgsrc/devel/darcs: Makefile PLIST distinfo
        pkgsrc/devel/darcs/patches: patch-Setup.hs

Log Message:
devel/darcs: update to darcs-2.18.5

Darcs 2.18.5, 9 Jan 2025

This release is mainly to keep up with (breaking) changes in some of our
dependencies. A plain `cabal update && cabal install darcs` should now again
succeed. It also includes a minor fix and an improvement for the
check/repair commands.

  * restrict upper limit on attoparsec from <0.15 to <14.4 for ghc versions <8.10
  * exclude system-fileio-0.3.16.5 which fails to build on Windows
  * raise upper bound on tls, data-default-class -> data-default
  * ci: only aim to be warnings clean on one version of GHC
  * check/repair: avoid newlines in progress messages
  * check/repair: display patch info of repaired patches

Darcs 2.18.4, 26 Oct 2024

  * darcs can now be built with stack against stackage lts-22.34, which is
    the version that the debian haskell team currently targets

  * resolve issue2725: the permissions of _darcs/patch_index are now
    generically set to those of its parent directory

Darcs 2.18.3, 26 May 2024

  * relax upper bounds for some dependencies

  * with GHC up to 9.8 all tests now succeed (including Windows and MacOS)

  * resolve issue2714: cannot remove recursively

  * resolve issue2715: hub.darcs.net does not support "Extended Main Secret"

    We use a new addition to crypton-connection in order to change the default
    setting back to old (tls < 2.0) default.

  * resolve issue2721 by excluding certain versions of directory package

    Versions 1.3.8 up to 1.3.8.4 of the directory package have a bug in their
    implementation of copyFile on Windows.

  * work around issue2720 (caused by x509-system indirect dependency, see
    (see https://github.com/kazu-yamamoto/crypton-certificate/issues/9)

  * make execution of release/gen-version-info.hs more robust

    Using cabal run instead of runghc inside of Setup.hs ensures that we use the
    same ghc version that cabal uses, avoiding dependency errors.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/darcs/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/darcs/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/darcs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/darcs/patches/patch-Setup.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/darcs/Makefile
diff -u pkgsrc/devel/darcs/Makefile:1.75 pkgsrc/devel/darcs/Makefile:1.76
--- pkgsrc/devel/darcs/Makefile:1.75    Thu May  9 01:31:42 2024
+++ pkgsrc/devel/darcs/Makefile Fri Jan 31 01:03:47 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2024/05/09 01:31:42 pho Exp $
+# $NetBSD: Makefile,v 1.76 2025/01/31 01:03:47 pho Exp $
 
-DISTNAME=      darcs-2.18.2
+DISTNAME=      darcs-2.18.5
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel scm
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,9 +10,9 @@ COMMENT=      Distributed revision control sy
 LICENSE=       gnu-gpl-v2
 
 HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       base    \
        crypton \
-       network \
-       tls
+       hashable
 
 # Use crypton instead of outdated cryptonite.
 SUBST_CLASSES+=                crypton
@@ -40,36 +39,38 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/contrib/darcs_completion \
                ${DESTDIR}${PREFIX}/share/bash-completion/completions/darcs
 
-.include "../../devel/hs-async/buildlink3.mk"
-.include "../../textproc/hs-attoparsec/buildlink3.mk"
-.include "../../converters/hs-base16-bytestring/buildlink3.mk"
-.include "../../devel/hs-conduit/buildlink3.mk"
-.include "../../devel/hs-constraints/buildlink3.mk"
-.include "../../security/hs-crypton/buildlink3.mk"
-.include "../../devel/hs-data-ordlist/buildlink3.mk"
+.include "../../devel/hs-safe/buildlink3.mk"
+.include "../../textproc/hs-regex-base/buildlink3.mk"
+.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
+.include "../../textproc/hs-regex-applicative/buildlink3.mk"
 .include "../../devel/hs-fgl/buildlink3.mk"
-.include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../textproc/hs-html/buildlink3.mk"
-.include "../../www/hs-http-conduit/buildlink3.mk"
-.include "../../www/hs-http-types/buildlink3.mk"
 .include "../../devel/hs-memory/buildlink3.mk"
-.include "../../devel/hs-mmap/buildlink3.mk"
-.include "../../net/hs-network/buildlink3.mk"
-.include "../../net/hs-network-uri/buildlink3.mk"
-.include "../../time/hs-old-time/buildlink3.mk"
-.include "../../textproc/hs-regex-applicative/buildlink3.mk"
-.include "../../textproc/hs-regex-base/buildlink3.mk"
-.include "../../textproc/hs-regex-compat-tdfa/buildlink3.mk"
-.include "../../devel/hs-safe/buildlink3.mk"
-.include "../../devel/hs-strict-identity/buildlink3.mk"
-.include "../../archivers/hs-tar/buildlink3.mk"
-.include "../../sysutils/hs-temporary/buildlink3.mk"
-.include "../../devel/hs-terminal-size/buildlink3.mk"
-.include "../../security/hs-tls/buildlink3.mk"
-.include "../../devel/hs-unix-compat/buildlink3.mk"
+.include "../../security/hs-crypton/buildlink3.mk"
+.include "../../converters/hs-base16-bytestring/buildlink3.mk"
 .include "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../devel/hs-vector/buildlink3.mk"
+.include "../../archivers/hs-tar/buildlink3.mk"
+.include "../../devel/hs-data-ordlist/buildlink3.mk"
+.include "../../textproc/hs-attoparsec/buildlink3.mk"
 .include "../../archivers/hs-zip-archive/buildlink3.mk"
+.include "../../devel/hs-async/buildlink3.mk"
+.include "../../devel/hs-constraints/buildlink3.mk"
+.include "../../devel/hs-unix-compat/buildlink3.mk"
+.include "../../time/hs-old-time/buildlink3.mk"
+.include "../../sysutils/hs-temporary/buildlink3.mk"
+.include "../../devel/hs-hashable/buildlink3.mk"
+.include "../../devel/hs-mmap/buildlink3.mk"
 .include "../../archivers/hs-zlib/buildlink3.mk"
+.include "../../net/hs-network-uri/buildlink3.mk"
+.include "../../net/hs-network/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
+.include "../../www/hs-http-conduit/buildlink3.mk"
+.include "../../www/hs-http-types/buildlink3.mk"
+.include "../../devel/hs-terminal-size/buildlink3.mk"
+.include "../../net/hs-crypton-connection/buildlink3.mk"
+.include "../../devel/hs-data-default/buildlink3.mk"
+.include "../../www/hs-http-client-tls/buildlink3.mk"
+.include "../../security/hs-tls/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/darcs/PLIST
diff -u pkgsrc/devel/darcs/PLIST:1.12 pkgsrc/devel/darcs/PLIST:1.13
--- pkgsrc/devel/darcs/PLIST:1.12       Sat May  4 13:25:03 2024
+++ pkgsrc/devel/darcs/PLIST    Fri Jan 31 01:03:47 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2024/05/04 13:25:03 pho Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/01/31 01:03:47 pho Exp $
 bin/darcs
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Patch.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Patch/Annotate.hi
@@ -236,6 +236,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Uti
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Util/Show.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Util/SignalHandler.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Util/Ssh.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Util/StrictIdentity.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Util/Tree.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Util/Tree/Hashed.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Darcs/Util/Tree/Monad.hi
@@ -250,7 +251,7 @@ lib/${PKGNAME}/${HS_VERSION}/package-id
 man/man1/darcs.1
 share/bash-completion/completions/darcs
 share/doc/${HS_PLATFORM}/${PKGNAME}/COPYING
-${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/CHANGELOG
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/CHANGELOG.md
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Patch-Annotate-Class.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Patch-Annotate.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Patch-Apply.html
@@ -487,6 +488,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Util-Show.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Util-SignalHandler.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Util-Ssh.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Util-StrictIdentity.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Util-Tree-Hashed.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Util-Tree-Monad.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Util-Tree-Plain.html

Index: pkgsrc/devel/darcs/distinfo
diff -u pkgsrc/devel/darcs/distinfo:1.18 pkgsrc/devel/darcs/distinfo:1.19
--- pkgsrc/devel/darcs/distinfo:1.18    Sat May  4 13:25:03 2024
+++ pkgsrc/devel/darcs/distinfo Fri Jan 31 01:03:47 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2024/05/04 13:25:03 pho Exp $
+$NetBSD: distinfo,v 1.19 2025/01/31 01:03:47 pho Exp $
 
-BLAKE2s (darcs-2.18.2.tar.gz) = fbb088cd39368fe564335e1a43a6d6658cb1fd313604737e49fce3ae0515127e
-SHA512 (darcs-2.18.2.tar.gz) = f776b3b2efd73e9515a99bf154468aa4aef925d20c9de564a78f7a19bf302db31c6e4cdbca2c2c700a0d5cde1b62a426159554f543898712b1f603401c534a9c
-Size (darcs-2.18.2.tar.gz) = 1291547 bytes
-SHA1 (patch-Setup.hs) = cb147ff81869ccbab7a301d54dca64d0a7801903
+BLAKE2s (darcs-2.18.5.tar.gz) = 79da025786f0fff0ebac534ce50ceab4766283941795986d32fc18d18d09ca4d
+SHA512 (darcs-2.18.5.tar.gz) = 858d134e0ad4af1b4adeb4dd8250a34b12358de5993c34ee33c9ebbbe85f5b7bf49e219da7f0cdd254601095c4c70f41430871c2dd7508d5f02f1b141ff1ad4d
+Size (darcs-2.18.5.tar.gz) = 1294531 bytes
+SHA1 (patch-Setup.hs) = 683c11ffc65351e0934edbc288fc14c23cbf1e04

Index: pkgsrc/devel/darcs/patches/patch-Setup.hs
diff -u pkgsrc/devel/darcs/patches/patch-Setup.hs:1.1 pkgsrc/devel/darcs/patches/patch-Setup.hs:1.2
--- pkgsrc/devel/darcs/patches/patch-Setup.hs:1.1       Mon Feb 14 14:45:09 2022
+++ pkgsrc/devel/darcs/patches/patch-Setup.hs   Fri Jan 31 01:03:47 2025
@@ -1,14 +1,16 @@
-$NetBSD: patch-Setup.hs,v 1.1 2022/02/14 14:45:09 pho Exp $
+$NetBSD: patch-Setup.hs,v 1.2 2025/01/31 01:03:47 pho Exp $
 
 Install the man page to the correct directory. This is pkgsrc-specific.
 
 --- Setup.hs.orig      2001-09-09 01:46:40.000000000 +0000
 +++ Setup.hs
-@@ -9,7 +9,7 @@ import Distribution.Package ( packageVer
+@@ -8,8 +8,8 @@ import Distribution.PackageDescription (
+ import Distribution.Package ( packageVersion )
  import Distribution.Version( Version )
  import Distribution.Simple.LocalBuildInfo
-          ( LocalBuildInfo(..), absoluteInstallDirs )
+-         ( LocalBuildInfo(..), absoluteInstallDirs )
 -import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
++         ( LocalBuildInfo(..), absoluteInstallDirs, buildDir )
 +import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
  import Distribution.Simple.Setup
      (buildVerbosity, copyDest, copyVerbosity, fromFlag,

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index