Changeset 131411


Ignore:
Timestamp:
Jan 11, 2015, 9:17:30 PM (3 years ago)
Author:
cal@…
Message:

Haskell: remove duplicate hs-binary which is now provided by GHC, fix build of pandoc, #42082

The ghc port installs a copy of the binary haskell module as of 7.8.3.
Previously, we had an additional hs-binary port that would install the same
module. On its uninstallation, it also unregistered the copy that came with
GHC, breaking its dependencies. This makes a revbump for GHC necessary.
Additionally, this commit removes all hs-binary dependencies and increases the
revision to force a rebuild with GHC's copy (unless the port is also upgraded
in this commit, in which case the revbump is unnecessary).

This commit also

  • updates hs-aeson to 0.7.0.4; 0.8.* is available, but requires a newer hs-text. Since hs-text is part of the Haskell platform, we could (a) leave the Haskell platform, which I'd like to avoid because it's tested and stable, whereas latest and greatest of the modules in the platform might not be, (b) ship a second, newer copy of hs-text, which is hard, because packages that depend on two versions of hs-text are hard to avoid in this case, and this situation could lead to build errors or crashes. For these reasons I've decided to stay at the somewhat older hs-aeson (and because of that and the same situation a couple of times more also at an older version of pandoc).
  • marks hs-binary obsolete
  • updates hs-conduit to 1.2.3.1
  • adds hs-enclosed-exceptions
  • updates hs-resourcet to 1.1.3.3
  • downgrades hs-scientific to 0.2.0.2 because hs-aeson 0.7.* needs hs-scientific ==0.2.*
  • updates hs-sha to 1.6.4.1
  • updates hs-tagsoup to 0.13.3
  • updates hs-texmath to 0.6.6.3, 0.8.* is available, but isn't supported before pandoc 1.13
  • updates hs-yaml to 0.8.10.1
  • updates hs-zip-archive to 0.1.4
  • updates pandoc to 1.12.4.2, which should close #42082
Location:
trunk/dports
Files:
22 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/hs-aeson/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       aeson 0.6.2.1
    8 revision            3
    9 checksums           rmd160  ac3d7bb17f8110b2deb2633896b5c00c3cfa4b73 \
    10                     sha256  cbcee6956d0a3cfc45073b6c160e9c412c3dfad0f36ec71d6044a391f108ca01
     7haskell.setup       aeson 0.7.0.4
     8checksums           rmd160  065188dba601b599a022fa727fb1fdc9f1b197ea \
     9                    sha256  53c83c4a488832d7964d9250e401066c236a80cdec66958f9b35104a19cb2f01
    1110
    1211maintainers         cal openmaintainer
     
    2423                    port:hs-hashable \
    2524                    port:hs-mtl \
     25                    port:hs-scientific \
    2626                    port:hs-syb \
    2727                    port:hs-text \
  • trunk/dports/devel/hs-binary/Portfile

    r131201 r131411  
    33
    44PortSystem          1.0
    5 PortGroup           haskell 1.0
    65
    7 haskell.setup       binary 0.7.1.0
    8 revision            3
    9 license             BSD
    10 maintainers         cal openmaintainer
    11 platforms           darwin
    12 
    13 checksums           rmd160  fdd4d824cbb863a72272cab7d8c641b19c8e70c6 \
    14                     sha256  9622efca717cd4f606dc3f43e93464b6eeb0f35e12dd0207065cc6533e498b99
    15 
    16 description         Binary serialisation for Haskell values using lazy ByteStrings
    17 long_description    \
    18     Efficient, pure binary serialisation using lazy ByteStrings. Haskell values \
    19     may be encoded to and from binary formats, written to disk as binary, or \
    20     sent over the network. The format used can be automatically generated, or \
    21     you can choose to implement a custom format if needed. Serialisation speeds \
    22     of over 1 G/sec have been observed, so this library should be suitable for \
    23     high performance scenarios.
     6name                hs-binary
     7version             0.3.0.0
     8revision            5
     9license             Permissive
     10categories          devel haskell
     11replaced_by         ghc
     12PortGroup           obsolete 1.0
  • trunk/dports/devel/hs-conduit/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       conduit 1.0.9.3
    8 revision            3
    9 checksums           rmd160  9525b7a17245c7fdd4b6c4257f7b42fb4eff19bf \
    10                     sha256  90ccae260f2871005746995d4ad8dd215fdb73dfaf16753c223732b007725498
     7haskell.setup       conduit 1.2.3.1
     8checksums           rmd160  860bc0c659a6610335dfd27a0ac035fac703dd18 \
     9                    sha256  786d4b29f9478c7aad63fb9a264c5a077a7ed6c62a209fab56a6a9981c18c312
    1110
    1211maintainers         cal openmaintainer
     
    2221    enumerator/iteratee and pipes.
    2322
    24 depends_lib-append  port:hs-lifted-base \
     23depends_lib-append  port:hs-exceptions \
     24                    port:hs-lifted-base \
    2525                    port:hs-mmorph \
    26                     port:hs-monad-control \
    2726                    port:hs-mtl \
    2827                    port:hs-resourcet \
    29                     port:hs-text \
    3028                    port:hs-transformers-base \
    3129                    port:hs-void
  • trunk/dports/devel/hs-enclosed-exceptions/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       yaml 0.8.5.2
    8 revision            5
    9 checksums           rmd160  77a0d4f8090068ac93c2b55e8c00fa4aa94cb1ca \
    10                     sha256  fbc999b2ee4062e942325037130e058bdaca214bb1f4e71428d7c553da2a48f4
     7haskell.setup       enclosed-exceptions 1.0.1
     8checksums           rmd160  af6d1eedd096355ab0139b64fad39d8a86fa70dd \
     9                    sha256  ff9b35b2278574002bf4ccf1c2293a7b500edba95382aa8242088a34220c2dce
    1110
    12 maintainers         cal openmaintainer
     11maintainers         nomaintainer
    1312platforms           darwin
    14 license             BSD
     13license             MIT
    1514
    16 description         Support for parsing and rendering YAML documents
     15description         Catching all exceptions from within an enclosed computation
    1716long_description    \
    18     Provides support for parsing and emitting Yaml documents.
     17    Catching all exceptions raised within an enclosed computation, while \
     18    remaining responsive to (external) asynchronous exceptions. For more \
     19    information on the technique, please see: \
     20    https://www.fpcomplete.com/user/snoyberg/general-haskell/exceptions/catching-all-exceptions.
    1921
    20 depends_lib-append  port:hs-aeson \
    21                     port:hs-attoparsec \
    22                     port:hs-conduit \
    23                     port:hs-resourcet \
    24                     port:hs-text \
    25                     port:hs-unordered-containers \
    26                     port:hs-vector
     22depends_lib-append  port:hs-async \
     23                    port:hs-lifted-base \
     24                    port:hs-monad-control
  • trunk/dports/devel/hs-hashed-storage/Portfile

    r131201 r131411  
    66
    77haskell.setup       hashed-storage 0.5.11
     8revision            1
    89checksums           rmd160  3be8b4a756c1bca25448a25e34415b4815382925 \
    910                    sha256  734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569
     
    1415
    1516description         Hashed file storage support code.
    16 long_description        \
    17         Support code for reading and manipulating hashed file storage \
    18         (where each file and directory is associated with a \
    19         cryptographic hash, for corruption-resistant storage and fast \
    20         comparisons). \
    21         \
    22         The supported storage formats include darcs hashed pristine, \
    23         a plain filesystem tree and an indexed plain tree (where the \
    24         index maintains hashes of the plain files and directories).
     17long_description    \
     18    Support code for reading and manipulating hashed file storage \
     19    (where each file and directory is associated with a \
     20    cryptographic hash, for corruption-resistant storage and fast \
     21    comparisons). \
     22    \
     23    The supported storage formats include darcs hashed pristine, \
     24    a plain filesystem tree and an indexed plain tree (where the \
     25    index maintains hashes of the plain files and directories).
    2526
    26 depends_lib-append  port:hs-binary \
    27                     port:hs-dataenc \
     27depends_lib-append  port:hs-dataenc \
    2828                    port:hs-extensible-exceptions \
    2929                    port:hs-mmap \
  • trunk/dports/devel/hs-hoc/Portfile

    r131201 r131411  
    4343
    4444depends_lib-append      port:gmp \
    45                         port:hs-binary \
    4645                        port:hs-parsec \
    4746                        port:hs-fgl
  • trunk/dports/devel/hs-hxt/Portfile

    r131201 r131411  
    66
    77haskell.setup       hxt 9.3.1.2
    8 revision            1
     8revision            2
    99checksums           rmd160  d6b21c01db606462660dd9281807db46596e6ec3 \
    1010                    sha256  d6486d465f0827e456143da18fa5519b6b418123c1cb182c215a2e5dcc4f926c
     
    2525    library makes extensive use of the arrow approach for processing XML.
    2626
    27 depends_lib-append  port:hs-binary \
    28                     port:hs-hunit \
     27depends_lib-append  port:hs-hunit \
    2928                    port:hs-hxt-charproperties \
    3029                    port:hs-hxt-regex-xmlschema \
  • trunk/dports/devel/hs-juicypixels/Portfile

    r131309 r131411  
    66
    77haskell.setup       JuicyPixels 3.2.2
     8revision            1
    89checksums           rmd160  820d86dabc1fee424b7038184d648aaf8f326071 \
    910                    sha256  1f3958b348eeecf928c91049af67cb504110e351b3f0b5225de3c403df21ad90
     
    1819    used by pandoc to represent structured documents.
    1920
    20 depends_lib-append  port:hs-binary \
    21                     port:hs-mmap \
     21depends_lib-append  port:hs-mmap \
    2222                    port:hs-mtl \
    2323                    port:hs-primitive \
  • trunk/dports/devel/hs-pandoc-types/Portfile

    r131307 r131411  
    66
    77haskell.setup       pandoc-types 1.12.4.1
     8revision            1
    89checksums           rmd160  e038c591b3c2e81bcd1485e29762be11a0f2513a \
    910                    sha256  187bda4b12746b9cc460ae98b39d0964adace2bcca2fd0e343b1ea4234a86ff1
  • trunk/dports/devel/hs-pointedlist/Portfile

    r131201 r131411  
    66
    77haskell.setup       pointedlist 0.4.0.4
    8 revision            2
     8revision            3
    99checksums           rmd160  84a930040389d79ed300c2389b2f1cd40bdd9b59 \
    1010                    sha256  69bced0457627a75682151e19e17b58a1f2acb8577cdccc2a1f0ae6d32e9dbdb
     
    2121    progressing past the actual edge.
    2222
    23 depends_lib-append  port:hs-binary \
    24                     port:hs-derive \
     23depends_lib-append  port:hs-derive \
    2524                    port:hs-fclabels
  • trunk/dports/devel/hs-puremd5/Portfile

    r131201 r131411  
    66
    77haskell.setup       pureMD5 2.1.2.1
    8 revision            3
     8revision            4
    99checksums           rmd160  b7c9c28e3422e8b1b14a3ad0b73feaee4576e017 \
    1010                    sha256  6768174686d5eaef76b487f6f8160a932c48012668fbe542e7aba489134956ff
     
    1919    supports the crypto-api class interface.
    2020
    21 depends_lib-append  port:hs-binary \
    22                     port:hs-cereal \
     21depends_lib-append  port:hs-cereal \
    2322                    port:hs-crypto-api \
    2423                    port:hs-tagged
  • trunk/dports/devel/hs-resourcet/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       resourcet 0.4.9
    8 revision            1
    9 checksums           rmd160  ee9a2b21508a421c18ed4830cd9e3ba83306f466 \
    10                     sha256  5fd1329d934e0cf6f3f3c9c3db8c4b49064e4c77be568e25d472facd2bbceaca
     7haskell.setup       resourcet 1.1.3.3
     8checksums           rmd160  9aebd452b0a9106f4dbbd527b53a211697a120b3 \
     9                    sha256  829f2a7427429dbfd343e03c5bfb3e46c3bfbe84a797e9c166d40f0b66b80546
    1110
    1211maintainers         cal openmaintainer
     
    1514
    1615description         Deterministic allocation and freeing of scarce resources
    17 long_description    \
    18     This package was originally included with the conduit package, and has \
    19     since been split off. For more information, please see \
    20     http://www.yesodweb.com/book/conduits.
     16long_description    ${description}
    2117
    22 depends_lib-append  port:hs-lifted-base \
     18depends_lib-append  port:hs-exceptions \
     19                    port:hs-lifted-base \
    2320                    port:hs-mmorph \
    2421                    port:hs-monad-control \
  • trunk/dports/devel/hs-scientific/Portfile

    r131394 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       scientific 0.3.3.5
    8 checksums           rmd160  421d75491a252573079947c3578f66b73416dc0b \
    9                     sha256  3d07689a786c20285982f463b61c848d4842159c46fa38868b1a896597a2f2cc
     7epoch               1
     8haskell.setup       scientific 0.2.0.2
     9checksums           rmd160  fc0e643024a7e86102c136ab8ff6d186bc9cf495 \
     10                    sha256  c0114a8809f34c1bc284e53ce0ce836a0f23ed2535ef9df06417e65a9c6a398f
    1011
    1112maintainers         nomaintainer
  • trunk/dports/devel/hs-sha/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       SHA 1.6.1
    8 revision            5
    9 checksums           rmd160  01950ac8e056fac60a50135d315a9f1896e031ec \
    10                     sha256  fdb9924aa31493ad198e3b3498a8204cc7013e0ef86215faf1c4e435a7166aec
     7haskell.setup       SHA 1.6.4.1
     8checksums           rmd160  d1038e82bea102adee67d51359d3fcf9c62159d4 \
     9                    sha256  743bc6d7dd3e74a44bfca8920f0f0ba5855722a62f6cc44f0a38d10c11bddc0d
    1110
    1211maintainers         nomaintainer
     
    2120    vectors for the various functions. While some attention has been paid to performance, \
    2221    these do not presently reach the speed of well-tuned libraries, like OpenSSL.
    23 
    24 depends_lib-append  port:hs-binary
  • trunk/dports/devel/hs-tagsoup/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       tagsoup 0.13
    8 revision            2
    9 checksums           rmd160  b94f75cc39784199e51a8d62816308a7c8944a5a \
    10                     sha256  617eba9017684ffcc4abe3627a43e2ad69d788901facdfa6a3b77f58b363d3dd
     7haskell.setup       tagsoup 0.13.3
     8checksums           rmd160  7cff95fed79e7b7b6e2c5d1d85cea00a832f925f \
     9                    sha256  32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d
    1110
    1211platforms           darwin
  • trunk/dports/devel/hs-texmath/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       texmath 0.6.5.2
    8 revision            4
    9 checksums           rmd160  e709b5078abc57e903262097d2c8019240793b5c \
    10                     sha256  749810eb9e01982730c66f11cdaf2af3252ee7dcc6a6089b1fa4cbad00716adf
     7haskell.setup       texmath 0.6.6.3
     8checksums           rmd160  fb270b239df58ca83a230b881cdbc4438bc1d130 \
     9                    sha256  82db05f65804453dcef692d2422bcff2d3b3ec9b0ea0811a4f49906599329eea
    1110
    1211maintainers         cal openmaintainer
  • trunk/dports/devel/hs-yaml/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       yaml 0.8.5.2
    8 revision            5
    9 checksums           rmd160  77a0d4f8090068ac93c2b55e8c00fa4aa94cb1ca \
    10                     sha256  fbc999b2ee4062e942325037130e058bdaca214bb1f4e71428d7c553da2a48f4
     7haskell.setup       yaml 0.8.10.1
     8checksums           rmd160  f563e22da28c518141d729e204b86ebe9db5fe0d \
     9                    sha256  e977912762e13571ec596173405ce328c8f7397aee4dd21f61ac9af762431ba9
    1110
    1211maintainers         cal openmaintainer
     
    2120                    port:hs-attoparsec \
    2221                    port:hs-conduit \
     22                    port:hs-enclosed-exceptions \
    2323                    port:hs-resourcet \
     24                    port:hs-scientific \
    2425                    port:hs-text \
    2526                    port:hs-unordered-containers \
  • trunk/dports/devel/hs-zip-archive/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       zip-archive 0.1.3.4
    8 revision            5
    9 checksums           rmd160  77f3b929bf6b3b836a80bdaf41653ddcb37a1bb9 \
    10                     sha256  cbef41120d995a87702f7bb0c1ed8107f3f36a61714b2e31d9d19df5466e7643
     7haskell.setup       zip-archive 0.1.4
     8checksums           rmd160  67947b053161abcb84e066ec13362dce5e18dad5 \
     9                    sha256  8b0eef1b4211e0fb55c7689d2b3ce452278a32578b92f7c4c3114da1f843f346
    1110
    1211platforms           darwin
     
    1918    extracting files from zip archives.
    2019
    21 depends_lib-append  port:hs-binary \
    22                     port:hs-digest \
     20depends_lib-append  port:hs-digest \
    2321                    port:hs-mtl \
    2422                    port:hs-utf8-string \
  • trunk/dports/devel/thrift-devel/Portfile

    r96767 r131411  
    9090    depends_lib-append      port:ghc \
    9191                            port:hs-http \
    92                             port:hs-binary
    9392}
    9493
  • trunk/dports/devel/thrift/Portfile

    r100058 r131411  
    8282    depends_lib-append      port:ghc \
    8383                            port:hs-http \
    84                             port:hs-binary
    8584}
    8685
  • trunk/dports/lang/ghc/Portfile

    r131261 r131411  
    99# When updating GHC, make sure to revbump all Haskell ports.
    1010version             7.8.3
     11revision            1
    1112categories          lang haskell
    1213maintainers         gmail.com:kitchen.andy cal openmaintainer
     
    106107    # Legacy port deactivation hack added 2013-08-14, hs-template-haskell is provided by base
    107108    lappend obsoletes hs-template-haskell
    108     # Legacy port deactivation hack added 2015-01-05, hs-transformers and hs-xhtml are provided by base
     109    # Legacy port deactivation hack added 2015-01-05, hs-transformers, hs-xhtml
     110    # and hs-binary are provided by base
    109111    lappend obsoletes hs-transformers
    110112    lappend obsoletes hs-xhtml
     113    lappend obsoletes hs-binary
    111114
    112115    foreach obsolete $obsoletes {
  • trunk/dports/textproc/pandoc/Portfile

    r131201 r131411  
    55PortGroup           haskell 1.0
    66
    7 haskell.setup       pandoc 1.12.2.1
    8 revision            7
     7haskell.setup       pandoc 1.12.4.2
    98name                pandoc
     9checksums           rmd160  d3e725ff4ed36f9259c07ad3de6878e3acbd1a9b \
     10                    sha256  2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45
     11
    1012categories          textproc
    1113platforms           darwin
     
    2224    Textile, groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB (v2 \
    2325    and v3), FictionBook2, and S5, Slidy and Slideous HTML slide shows.
    24 
    25 checksums           rmd160  89bdcc402abe0bc36641f1f30e268a705befe841 \
    26                     sha256  8e9a37bb802efd44e6e6063060105ad4ef8328a093fccbd971c533f0b583dbf7
    2726
    2827depends_lib-append  \
     
    4544                    port:hs-random \
    4645                    port:hs-syb \
     46                    port:hs-sha \
    4747                    port:hs-tagsoup \
    4848                    port:hs-temporary \
Note: See TracChangeset for help on using the changeset viewer.