diff options
| author | Timothy Sample <samplet@ngyro.com> | 2019-11-08 01:55:07 -0500 |
|---|---|---|
| committer | Timothy Sample <samplet@ngyro.com> | 2019-11-20 20:48:48 -0500 |
| commit | b4a00fecfd8c21ebce88d5ac9b23e61315e739a2 (patch) | |
| tree | 44d95116a9f53fc6d685b1df448e76786505089b /gnu | |
| parent | 0710797d3088bd142be943fa1283c9d47afc458d (diff) | |
| download | guix-patches-b4a00fecfd8c21ebce88d5ac9b23e61315e739a2.tar guix-patches-b4a00fecfd8c21ebce88d5ac9b23e61315e739a2.tar.gz | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/haskell-xyz.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch | 27 |
3 files changed, 29 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8e937c8734..f7d37c4f81 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 7d3c94c432..f352f6b187 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 0000000000..c1ef6a837c --- /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]" |