[Git][haskell-team/DHG_packages][master] ghc-typelits-natnormalise: Fix test error

[Scott Talbert (@swt2c)]

Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
4507d253 by Scott Talbert at 2026-01-11T17:46:11-05:00
ghc-typelits-natnormalise: Fix test error

- - - - -


3 changed files:

- p/haskell-ghc-typelits-natnormalise/debian/changelog
- + p/haskell-ghc-typelits-natnormalise/debian/patches/fix-test-error
- + p/haskell-ghc-typelits-natnormalise/debian/patches/series


Changes:

=====================================
p/haskell-ghc-typelits-natnormalise/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-ghc-typelits-natnormalise (0.7.10-3) unstable; urgency=medium
+
+  * Fix test error
+
+ -- Scott Talbert <swt at techie.net>  Sun, 11 Jan 2026 17:45:56 -0500
+
 haskell-ghc-typelits-natnormalise (0.7.10-2) unstable; urgency=medium
 
   * Build using dh-haskell


=====================================
p/haskell-ghc-typelits-natnormalise/debian/patches/fix-test-error
=====================================
@@ -0,0 +1,46 @@
+From a133c7e4dc38834e0cd913eeb7a10d501642dc26 Mon Sep 17 00:00:00 2001
+From: Martijn Bastiaan <martijn at hmbastiaan.nl>
+Date: Sun, 20 Jul 2025 07:47:53 +0200
+Subject: [PATCH] Import `Data.Type.Ord` for GHC version agnostic errors (#91)
+
+Fixes #89
+---
+ .github/workflows/haskell-ci.yml |  5 +++++
+ tests/ErrorTests.hs              | 20 ++++++++++++--------
+ 2 files changed, 17 insertions(+), 8 deletions(-)
+
+--- a/tests/ErrorTests.hs
++++ b/tests/ErrorTests.hs
+@@ -28,6 +28,10 @@ import GHC.IO.Encoding            (getLo
+ import Language.Haskell.TH        (litE, stringL)
+ import Language.Haskell.TH.Syntax (runIO)
+ 
++#if __GLASGOW_HASKELL__ >= 901
++import qualified Data.Type.Ord
++#endif
++
+ testProxy1 :: Proxy (x + 1) -> Proxy (2 + x)
+ testProxy1 = id
+ 
+@@ -194,8 +198,8 @@ testProxy10Errors =
+ #if __GLASGOW_HASKELL__ >= 910
+   [$(do localeEncoding <- runIO (getLocaleEncoding)
+         if textEncodingName localeEncoding == textEncodingName utf8
+-          then litE $ stringL "Couldn't match type ‘ghc-internal-9.1001.0:GHC.Internal.Data.Type.Ord.OrdCond"
+-          else litE $ stringL "Couldn't match type `ghc-internal-9.1001.0:GHC.Internal.Data.Type.Ord.OrdCond"
++          then litE $ stringL "Couldn't match type ‘Data.Type.Ord.OrdCond"
++          else litE $ stringL "Couldn't match type `Data.Type.Ord.OrdCond"
+     )
+   ,$(do localeEncoding <- runIO (getLocaleEncoding)
+         if textEncodingName localeEncoding == textEncodingName utf8
+@@ -337,8 +341,8 @@ testProxy14Errors =
+ #if __GLASGOW_HASKELL__ >= 910
+   [$(do localeEncoding <- runIO (getLocaleEncoding)
+         if textEncodingName localeEncoding == textEncodingName utf8
+-          then litE $ stringL "Couldn't match type ‘ghc-internal-9.1001.0:GHC.Internal.Data.Type.Ord.OrdCond"
+-          else litE $ stringL "Couldn't match type `ghc-internal-9.1001.0:GHC.Internal.Data.Type.Ord.OrdCond"
++          then litE $ stringL "Couldn't match type ‘Data.Type.Ord.OrdCond"
++          else litE $ stringL "Couldn't match type `Data.Type.Ord.OrdCond"
+     )
+   ,$(do localeEncoding <- runIO (getLocaleEncoding)
+         if textEncodingName localeEncoding == textEncodingName utf8


=====================================
p/haskell-ghc-typelits-natnormalise/debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-test-error



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/4507d2536e17d2cd413ddef5f8d43a75c1c07d21

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/4507d2536e17d2cd413ddef5f8d43a75c1c07d21
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20260111/9ff6b973/attachment-0001.htm>