[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
291/328: gnu: ghc-microlens-aeson: Patch tests for i686-linux.
From: |
guix-commits |
Subject: |
291/328: gnu: ghc-microlens-aeson: Patch tests for i686-linux. |
Date: |
Sat, 16 Nov 2019 19:33:28 -0500 (EST) |
samplet pushed a commit to branch wip-haskell-updates
in repository guix.
commit 746de893ef53868575cf000ec1ced0e60a66ddc1
Author: Timothy Sample <address@hidden>
Date: Fri Nov 8 01:55:07 2019 -0500
gnu: ghc-microlens-aeson: Patch tests for i686-linux.
* gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/haskell-xyz.scm (ghc-microlens-aeson): Use it.
---
gnu/local.mk | 1 +
gnu/packages/haskell-xyz.scm | 1 +
.../patches/ghc-microlens-aeson-fix-tests.patch | 27 ++++++++++++++++++++++
3 files changed, 29 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 8d58d1f..933eee9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -881,6 +881,7 @@ dist_patch_DATA =
\
%D%/packages/patches/ghc-diff-swap-cover-args.patch \
%D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch
\
%D%/packages/patches/ghc-hpack-fix-tests.patch \
+ %D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \
%D%/packages/patches/ghc-monad-par-fix-tests.patch \
%D%/packages/patches/ghc-pandoc-fix-html-tests.patch \
%D%/packages/patches/ghc-pandoc-fix-latex-test.patch \
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 7d3c94c..f352f6b 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -6591,6 +6591,7 @@ stripped. As the result, this package has no
dependencies.")
(uri (string-append "https://hackage.haskell.org/package/"
"microlens-aeson/microlens-aeson-"
version ".tar.gz"))
+ (patches (search-patches "ghc-microlens-aeson-fix-tests.patch"))
(sha256
(base32
"0w630kk5bnily1qh41081gqgbwmslrh5ad21899gwnb2r3jripyw"))))
diff --git a/gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch
b/gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch
new file mode 100644
index 0000000..c1ef6a8
--- /dev/null
+++ b/gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch
@@ -0,0 +1,27 @@
+This patch fixes the test suite to allow any order when listing the
+members of a JSON object. Aeson (being true to the JSON specification)
+does not specify an order for objects. In practice, the order depends
+on your processor architecture.
+
+See <https://github.com/bos/aeson/issues/568> for a discussion resulting
+in a similar patch fixing the Aeson tests.
+
+See <https://github.com/fosskers/microlens-aeson/issues/1> for the
+upstream bug report.
+
+diff -ruN a/test/Test.hs b/test/Test.hs
+--- a/test/Test.hs 2018-12-31 15:10:50.000000000 -0500
++++ b/test/Test.hs 2019-11-08 01:34:07.419706831 -0500
+@@ -48,8 +48,10 @@
+ , testCase "" $ ("{\"a\": {}, \"b\": null}" ^? key (T.pack "b") .
_Object) @?= Nothing
+ , testCase "" $ ("{\"a\": 100, \"b\": 200}" ^? key (T.pack "a")) @?= Just
(Number 100.0)
+ , testCase "" $ ("[1,2,3]" ^? key (T.pack "a")) @?= Nothing
+- , testCase "" $ ("{\"a\": 4, \"b\": 7}" ^.. members) @?= [Number
4.0,Number 7.0]
+- , testCase "" $ ("{\"a\": 4, \"b\": 7}" & members . _Number %~ (* 10))
@?= "{\"a\":40,\"b\":70}"
++ , testCase "" $ assertBool "" (let x = ("{\"a\": 4, \"b\": 7}" ^..
members)
++ in x == [Number 4.0,Number 7.0] || x ==
[Number 7.0,Number 4.0])
++ , testCase "" $ assertBool "" (let x = ("{\"a\": 4, \"b\": 7}" & members
. _Number %~ (* 10))
++ in x == "{\"a\":40,\"b\":70}" || x ==
"{\"b\":70,\"a\":40}")
+ , testCase "" $ ("[1,2,3]" ^? nth 1) @?= Just (Number 2.0)
+ , testCase "" $ ("{\"a\": 100, \"b\": 200}" ^? nth 1) @?= Nothing
+ , testCase "" $ ("[1,2,3]" & nth 1 .~ Number 20) @?= "[1,20,3]"
- 229/328: gnu: ghc-conduit: Update to 1.3.1.1., (continued)
- 229/328: gnu: ghc-conduit: Update to 1.3.1.1., guix-commits, 2019/11/16
- 276/328: gnu: Add ghc-edit-distance-vector., guix-commits, 2019/11/16
- 288/328: gnu: ghc-tasty-rerun: Update to 1.1.14., guix-commits, 2019/11/16
- 306/328: gnu: Add ghc-timezone-series., guix-commits, 2019/11/16
- 310/328: gnu: Add ghc-tar-conduit., guix-commits, 2019/11/16
- 319/328: gnu: Add ghc-numeric-extras., guix-commits, 2019/11/16
- 316/328: gnu: Add ghc-monoid-extras., guix-commits, 2019/11/16
- 320/328: gnu: Add ghc-intervals., guix-commits, 2019/11/16
- 324/328: gnu: Add ghc-svg-builder., guix-commits, 2019/11/16
- 326/328: gnu: ngless: Update to 1.0.1., guix-commits, 2019/11/16
- 291/328: gnu: ghc-microlens-aeson: Patch tests for i686-linux.,
guix-commits <=
- 303/328: gnu: idris: Fix Cabal dependency constraints., guix-commits, 2019/11/16
- 304/328: gnu: elm-compiler: Fix Cabal dependency constraints., guix-commits, 2019/11/16
- 305/328: gnu: Add ghc-alsa-mixer., guix-commits, 2019/11/16
- 308/328: gnu: Add ghc-dbus., guix-commits, 2019/11/16
- 315/328: gnu: Add ghc-groups., guix-commits, 2019/11/16
- 317/328: gnu: Add ghc-dual-tree., guix-commits, 2019/11/16
- 311/328: gnu: Add ghc-testing-type-modifiers., guix-commits, 2019/11/16
- 325/328: gnu: Add ghc-diagrams-svg., guix-commits, 2019/11/16
- 327/328: gnu: ghc-haddock-api: Update to 2.22.0., guix-commits, 2019/11/16