[Git][haskell-team/DHG_packages][master] 2 commits: pantry: Drop 'missing-setup' patch

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
cabeaff7 by Ilias Tsitsimpis at 2020-07-17T19:46:14+03:00
pantry: Drop 'missing-setup' patch

- - - - -
40b5c9f7 by Ilias Tsitsimpis at 2020-07-17T20:42:40+03:00
microlens-aeson: Patch to fix tests on 32-bit systems

- - - - -


7 changed files:

- p/haskell-microlens-aeson/debian/changelog
- + p/haskell-microlens-aeson/debian/patches/fix-tests
- p/haskell-microlens-aeson/debian/patches/series
- p/haskell-pantry/debian/changelog
- p/haskell-pantry/debian/control
- − p/haskell-pantry/debian/patches/missing-setup
- − p/haskell-pantry/debian/patches/series


Changes:

=====================================
p/haskell-microlens-aeson/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-microlens-aeson (2.3.0.4-3) unstable; urgency=medium
+
+  * Patch to fix tests on 32-bit systems
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 17 Jul 2020 20:01:10 +0300
+
 haskell-microlens-aeson (2.3.0.4-2) unstable; urgency=medium
 
   * Mention files licensed under BSD-3-clause


=====================================
p/haskell-microlens-aeson/debian/patches/fix-tests
=====================================
@@ -0,0 +1,29 @@
+Description: Make tests deterministic
+ Apply the same fix as with lens-aeson [1] to make tests deterministic.
+ .
+ [1] https://github.com/lens/lens-aeson/commit/1d5059f57c31ce3c1
+Bug: https://github.com/fosskers/microlens-aeson/issues/5
+
+Index: b/test/Test.hs
+===================================================================
+--- a/test/Test.hs
++++ b/test/Test.hs
+@@ -7,6 +7,7 @@ import           Lens.Micro
+ import           Lens.Micro.Aeson
+ import           Test.Tasty
+ import           Test.Tasty.HUnit
++import           Data.List
+ 
+ ---
+ 
+@@ -48,8 +49,8 @@ suite = testGroup "Unit Tests"
+     , 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 "" $ (sort ("{\"a\": 4, \"b\": 7}" ^.. members . _Number)) @?= [4.0, 7.0]
++    , testCase "" $ ("{\"a\": 4}" & members . _Number %~ (* 10)) @?= "{\"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]"


=====================================
p/haskell-microlens-aeson/debian/patches/series
=====================================
@@ -1 +1,2 @@
 no-rts-N
+fix-tests


=====================================
p/haskell-pantry/debian/changelog
=====================================
@@ -2,4 +2,4 @@ haskell-pantry (0.4.0.1-1) unstable; urgency=low
 
   * Initial release
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 19 Jun 2020 15:00:23 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 17 Jul 2020 19:46:09 +0300


=====================================
p/haskell-pantry/debian/control
=====================================
@@ -5,7 +5,7 @@ Priority: optional
 Section: haskell
 Rules-Requires-Root: no
 Build-Depends: debhelper (>= 10),
- haskell-devscripts (>= 0.13),
+ haskell-devscripts (>= 0.16),
  cdbs,
  ghc,
  ghc-prof,


=====================================
p/haskell-pantry/debian/patches/missing-setup deleted
=====================================
@@ -1,10 +0,0 @@
-Description: Add Setup.hs missing from upstream tarball
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-
-Index: b/Setup.hs
-===================================================================
---- /dev/null
-+++ b/Setup.hs
-@@ -0,0 +1,2 @@
-+import Distribution.Simple
-+main = defaultMain


=====================================
p/haskell-pantry/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-missing-setup



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/c5a7aea1fe242d8e50c431d8e3f0d3518204098b...40b5c9f76c77b883c5dfd27876e0c5c0995090d4

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/c5a7aea1fe242d8e50c431d8e3f0d3518204098b...40b5c9f76c77b883c5dfd27876e0c5c0995090d4
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/20200717/39e4b541/attachment-0001.html>