Accepting request 1231484 from devel:languages:haskell

version update for ghc-9.10.1 OBS-URL: https://build.opensuse.org/request/show/1231484 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-unicode-data?expand=0&rev=10
osc copypac from project:devel:languages:haskell:ghc-9.10.x package:ghc-unicode-data revision:2, using keep-link
2024-12-20 22:11:09 +00:00 · 2024-12-10 11:25:58 +00:00
5 changed files with 87 additions and 52 deletions
--- a/ghc-unicode-data.changes
+++ b/ghc-unicode-data.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Sat Oct 26 18:30:11 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update unicode-data to version 0.6.0 revision 2.
+  ## 0.6.0 (July 2024)
+
+  - Updated to [Unicode 15.1.0](https://www.unicode.org/versions/Unicode15.1.0/).
+  - Added `showCodePoint` to `Unicode.Char`.
+  - Added `intToDigiT` to `Unicode.Char.Numeric`.
+
+  ### Removed
+
+  - Removed deprecated `isLetter` and `isSpace` from `Unicode.Char.General`.
+    Use the corresponding functions from `Unicode.Char.General.Compat` instead.
+  - Remove deprecated `isLower` and `isUpper` from `Unicode.Char.Case`.
+    Use the corresponding functions from `Unicode.Char.Case.Compat` instead.
+  - Removed deprecated `Unicode.Char.Numeric.isNumber`.
+    Use `Unicode.Char.Numeric.Compat.isNumber` instead.
+
+  ### Deprecations
+
+  - `Unicode.Char.General.isAlphaNum`.
+    Use `Unicode.Char.General.Compat.isAlphaNum` instead.
+
+  ## 0.5.0 (July 2024)
+
+  - Fix the inlining of `Addr#` literals and reduce their size. This results in
+    a sensible decrease of the executable size.
+  - Changed `integerValue` from `Char -> Maybe Int` to `(Integral a) => Char -> Maybe a`.
+
 -------------------------------------------------------------------
 Sun Jun 23 13:36:34 UTC 2024 - Peter Simons <psimons@suse.com>

--- a/ghc-unicode-data.spec
+++ b/ghc-unicode-data.spec
@@ -20,13 +20,13 @@
 %global pkgver %{pkg_name}-%{version}
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.4.0.1
+Version:        0.6.0
 Release:        0
 Summary:        Access Unicode Character Database (UCD)
 License:        Apache-2.0
 URL:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal
+Source1:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-base-prof
@@ -44,7 +44,7 @@ Performance is the primary goal in the design of this package.

 The Haskell data structures are generated programmatically from the UCD files.
 The latest Unicode version supported by this library is
-'<https://www.unicode.org/versions/Unicode15.0.0/ 15.0.0>'.
+'<https://www.unicode.org/versions/Unicode15.1.0/ 15.1.0>'.

 %package devel
 Summary:        Haskell %{pkg_name} library development files
--- a/unicode-data-0.4.0.1.tar.gz
+++ b/unicode-data-0.4.0.1.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37a5dea6801940beb65c4ac4b9d0f7e653a686cf773507f0ca61c210e0b06080
-size 187381
--- a/unicode-data-0.6.0.tar.gz
+++ b/unicode-data-0.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b28733168535a23c068c2554a118f0ba544561f93f37a1c4e8556e3e4d029947
+size 173351
--- a/unicode-data.cabal
+++ b/unicode-data.cabal
@@ -1,7 +1,7 @@
 cabal-version:       2.2
 name:                unicode-data
-version:             0.4.0.1
-x-revision: 3
+version:             0.6.0
+x-revision: 2
 synopsis:            Access Unicode Character Database (UCD)
 description:
  @unicode-data@ provides Haskell APIs to efficiently access the
@@ -10,7 +10,7 @@ description:
  .
  The Haskell data structures are generated programmatically from the UCD files.
  The latest Unicode version supported by this library is
-  @<https://www.unicode.org/versions/Unicode15.0.0/ 15.0.0>@.
+  @<https://www.unicode.org/versions/Unicode15.1.0/ 15.1.0>@.
 homepage:            http://github.com/composewell/unicode-data
 bug-reports:         https://github.com/composewell/unicode-data/issues
 license:             Apache-2.0
@@ -27,12 +27,14 @@ tested-with:         GHC==8.0.2
                   , GHC==8.6.5
                   , GHC==8.8.4
                   , GHC==8.10.7
-                   , GHC==9.0.1
-                   , GHC==9.2.1
-                   , GHC==9.4.2
-                   , GHC==9.6.0
+                   , GHC==9.0.2
+                   , GHC==9.2.8
+                   , GHC==9.4.8
+                   , GHC==9.6.5
+                   , GHC==9.8.2
+                   , GHC==9.10.1

-extra-source-files:
+extra-doc-files:
    Changelog.md
    README.md
    NOTICE
@@ -41,11 +43,6 @@ source-repository head
  type: git
  location: https://github.com/composewell/unicode-data

-flag ucd2haskell
-  description: Build the ucd2haskell executable
-  manual: True
-  default: False
-
 common default-extensions
  default-extensions:
      BangPatterns
@@ -55,10 +52,9 @@ common default-extensions
      ScopedTypeVariables
      TupleSections
      FlexibleContexts
+      LambdaCase

      -- Experimental, may lead to issues
-      DeriveAnyClass
-      TemplateHaskell
      UnboxedTuples

 common compile-options
@@ -69,9 +65,14 @@ common compile-options
               -fwarn-tabs
  default-language: Haskell2010

+flag dev-has-icu
+  description:
+    Use ICU for test and benchmark. Intended for development on the repository.
+  manual: True
+  default: False
+
 library
  import: default-extensions, compile-options
-  default-language: Haskell2010
  exposed-modules:
      Unicode.Char
      -- The module structure is derived from
@@ -113,30 +114,15 @@ library
      Unicode.Internal.Char.UnicodeData.SimpleLowerCaseMapping
      Unicode.Internal.Char.UnicodeData.SimpleTitleCaseMapping
      Unicode.Internal.Char.UnicodeData.SimpleUpperCaseMapping
+      Unicode.Internal.Char.Version

  hs-source-dirs: lib
  ghc-options: -O2
  build-depends:
-      base >=4.7 && <4.21
-
-executable ucd2haskell
-  import: default-extensions, compile-options
-  default-language: Haskell2010
-  ghc-options: -O2
-  hs-source-dirs: exe
-  main-is: UCD2Haskell.hs
-  other-modules: Parser.Text
-  if flag(ucd2haskell)
-    buildable: True
-    build-depends:
-        base             >= 4.7   && < 4.20
-      , containers       >= 0.5   && < 0.7
-      , directory        >= 1.3.6 && < 1.3.9
-      , filepath         >= 1.4.100 && < 1.5
-      , getopt-generics  >= 0.13  && < 0.14
-      , streamly         >= 0.8.0 && < 0.8.1
-  else
-    buildable: False
+      base >=4.7 && < 4.22
+  if impl(ghc < 9.0)
+    -- Required for unpackCString#
+    build-depends: ghc-prim

 test-suite test
  import: default-extensions, compile-options
@@ -147,24 +133,43 @@ test-suite test
  other-modules:
      Unicode.CharSpec
  build-depends:
-      base             >= 4.7   && < 4.20
+      base             >= 4.7   && < 4.22
    , hspec            >= 2.0   && < 2.12
    , unicode-data
-  -- We need to match a GHC version with the same Unicode version.
-  -- See: test/Unicode/CharSpec.hs for compatibility table.
-  if impl(ghc >= 9.5.1)
-    cpp-options: -DCOMPATIBLE_GHC_UNICODE
-  default-language: Haskell2010
+  if flag(dev-has-icu)
+    cpp-options: -DHAS_ICU
+    other-modules:
+        ICU.CharSpec
+    build-depends:
+        icu

 benchmark bench
  import: default-extensions, compile-options
  type: exitcode-stdio-1.0
  hs-source-dirs: bench
  main-is: Main.hs
+  other-modules:
+    Unicode.Char.Bench
+    Unicode.Char.CaseBench
+    Unicode.Char.Case.CompatBench
+    Unicode.Char.GeneralBench
+    Unicode.Char.General.BlocksBench
+    Unicode.Char.General.CompatBench
+    Unicode.Char.IdentifiersBench
+    Unicode.Char.NormalizationBench
+    Unicode.Char.NumericBench
+    Unicode.Char.Numeric.CompatBench
  build-depends:
-    base        >= 4.7   && < 4.20,
+    base        >= 4.7   && < 4.22,
    deepseq     >= 1.1   && < 1.6,
-    tasty-bench >= 0.2.5 && < 0.4,
-    tasty       >= 1.4.1,
+    tasty-bench >= 0.2.5 && < 0.5,
+    tasty       >= 1.4.1 && < 1.6,
    unicode-data
-  ghc-options: -O2 -fdicts-strict -rtsopts
+  if impl(ghc < 9.0)
+    -- Required for noinline
+    build-depends: ghc-prim
+  -- [NOTE] Recommendation of tasty-bench to reduce garbage collection noisiness
+  ghc-options: -O2 -fdicts-strict -rtsopts -with-rtsopts=-A32m
+  -- [NOTE] Recommendation of tasty-bench for comparison against baseline
+  if impl(ghc >= 8.6)
+    ghc-options: -fproc-alignment=64
Author	SHA256	Message	Date
Dominique Leuenberger	fa90e1547d	Accepting request 1231484 from devel:languages:haskell version update for ghc-9.10.1 OBS-URL: https://build.opensuse.org/request/show/1231484 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-unicode-data?expand=0&rev=10	2024-12-20 22:11:09 +00:00
Peter Simons	0d96f4a999	osc copypac from project:devel:languages:haskell:ghc-9.10.x package:ghc-unicode-data revision:2, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-unicode-data?expand=0&rev=22	2024-12-10 11:25:58 +00:00