[Git][haskell-team/DHG_packages][master] 7 commits: hlint: Upgrading from 2.1.17 to 2.2.11

Ilias Tsitsimpis gitlab at salsa.debian.org
Mon Jul 20 14:59:35 BST 2020



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


Commits:
b4300b38 by Ilias Tsitsimpis at 2020-07-20T16:51:22+03:00
hlint: Upgrading from 2.1.17 to 2.2.11

- - - - -
12a324d3 by Ilias Tsitsimpis at 2020-07-20T16:51:22+03:00
pretty-simple: Disable RTS -N

- - - - -
999890d5 by Ilias Tsitsimpis at 2020-07-20T16:51:22+03:00
optparse-simple: Sourceful upload for GHC 8.8

- - - - -
6ee5c432 by Ilias Tsitsimpis at 2020-07-20T16:51:22+03:00
secret-sharing: Upgrading from 1.0.1.0 to 1.0.1.2

- - - - -
ebd445b5 by Ilias Tsitsimpis at 2020-07-20T16:51:22+03:00
snap: Upgrading from 1.1.2.0 to 1.1.3.0

- - - - -
5f5f3f41 by Ilias Tsitsimpis at 2020-07-20T16:51:22+03:00
streaming-commons: Remove `AI_ADDRCONFIG`

- - - - -
52a6a712 by Ilias Tsitsimpis at 2020-07-20T16:51:22+03:00
cborg: Disable RTS -N

- - - - -


26 changed files:

- p/haskell-cborg/debian/changelog
- + p/haskell-cborg/debian/patches/no-rts-N
- + p/haskell-cborg/debian/patches/series
- p/haskell-cborg/debian/rules
- p/haskell-optparse-simple/debian/changelog
- p/haskell-optparse-simple/debian/control
- p/haskell-pretty-simple/debian/changelog
- + p/haskell-pretty-simple/debian/patches/no-rts-N
- + p/haskell-pretty-simple/debian/patches/series
- p/haskell-secret-sharing/debian/changelog
- p/haskell-secret-sharing/debian/control
- − p/haskell-secret-sharing/debian/patches/missing-test-suite-deps.patch
- − p/haskell-secret-sharing/debian/patches/series
- p/haskell-snap/debian/changelog
- p/haskell-snap/debian/control
- p/haskell-snap/debian/patches/no-fail
- p/haskell-snap/debian/patches/no-test-framework-smallcheck
- p/haskell-snap/debian/patches/rename-snap-binary
- p/haskell-streaming-commons/debian/changelog
- p/haskell-streaming-commons/debian/control
- + p/haskell-streaming-commons/debian/patches/remove-ADDRCONFIG
- + p/haskell-streaming-commons/debian/patches/series
- p/hlint/debian/changelog
- p/hlint/debian/control
- − p/hlint/debian/patches/newer-deps
- − p/hlint/debian/patches/series


Changes:

=====================================
p/haskell-cborg/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+haskell-cborg (0.2.3.0-2) unstable; urgency=medium
+
+  * Don't build test executables with RTS -N; most of
+    Debian's architectures lack SMP support.
+  * Re-enable tests on all architectures
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 20 Jul 2020 14:27:37 +0300
+
 haskell-cborg (0.2.3.0-1) unstable; urgency=medium
 
   * New upstream version.


=====================================
p/haskell-cborg/debian/patches/no-rts-N
=====================================
@@ -0,0 +1,11 @@
+--- a/cborg.cabal
++++ b/cborg.cabal
+@@ -111,7 +111,7 @@
+   default-language:  Haskell2010
+   ghc-options:
+     -Wall -fno-warn-orphans
+-    -threaded -rtsopts "-with-rtsopts=-N2"
++    -threaded -rtsopts
+ 
+   other-modules:
+     Tests.UnitTests


=====================================
p/haskell-cborg/debian/patches/series
=====================================
@@ -0,0 +1 @@
+no-rts-N


=====================================
p/haskell-cborg/debian/rules
=====================================
@@ -4,12 +4,7 @@ DEB_SETUP_BIN_NAME = debian/hlibrary.setup
 DEB_CABAL_PACKAGE = cborg
 DEB_DEFAULT_COMPILER = ghc
 
-ifneq (,$(filter amd64 arm64 i386 ppc64el, $(DEB_HOST_ARCH)))
-	DEB_ENABLE_TESTS = yes
-else
-	DEB_ENABLE_TESTS = no
-endif
-
+DEB_ENABLE_TESTS = yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk


=====================================
p/haskell-optparse-simple/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-optparse-simple (0.1.1.2-2) unstable; urgency=medium
+
+  * Sourceful upload for GHC 8.8
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 20 Jul 2020 07:06:33 +0300
+
 haskell-optparse-simple (0.1.1.2-1) unstable; urgency=medium
 
   * New upstream version.


=====================================
p/haskell-optparse-simple/debian/control
=====================================
@@ -18,7 +18,7 @@ Build-Depends:
 Build-Depends-Indep: ghc-doc,
  libghc-githash-doc,
  libghc-optparse-applicative-doc,
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
 Homepage: https://github.com/fpco/optparse-simple#readme
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-optparse-simple
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-optparse-simple]


=====================================
p/haskell-pretty-simple/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-pretty-simple (3.2.2.0-3) unstable; urgency=medium
+
+  * Don't build executables with RTS -N; most of
+    Debian's architectures lack SMP support.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 20 Jul 2020 06:55:27 +0300
+
 haskell-pretty-simple (3.2.2.0-2) unstable; urgency=medium
 
   * Fix Build-Depends.


=====================================
p/haskell-pretty-simple/debian/patches/no-rts-N
=====================================
@@ -0,0 +1,47 @@
+--- a/pretty-simple.cabal
++++ b/pretty-simple.cabal
+@@ -57,7 +57,7 @@
+                      , text
+                      , optparse-applicative
+   default-language:    Haskell2010
+-  ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
++  ghc-options:         -Wall -threaded -rtsopts
+ 
+   if flag(buildexe)
+     buildable:       True
+@@ -72,7 +72,7 @@
+   build-depends:       base
+                      , pretty-simple
+   default-language:    Haskell2010
+-  ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
++  ghc-options:         -Wall -threaded -rtsopts
+ 
+   if flag(buildexample)
+     buildable:       True
+@@ -89,7 +89,7 @@
+                      , pretty-simple
+                      , text
+   default-language:    Haskell2010
+-  ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
++  ghc-options:         -Wall -threaded -rtsopts
+ 
+   if flag(buildexample)
+     buildable:       True
+@@ -106,7 +106,7 @@
+                      , QuickCheck
+                      , template-haskell
+   default-language:    Haskell2010
+-  ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
++  ghc-options:         -Wall -threaded -rtsopts
+ 
+ benchmark pretty-simple-bench
+   type:                exitcode-stdio-1.0
+@@ -119,7 +119,7 @@
+                      , pretty-simple
+                      , text
+   default-language:    Haskell2010
+-  ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
++  ghc-options:         -Wall -threaded -rtsopts
+ 
+ source-repository head
+   type:     git


=====================================
p/haskell-pretty-simple/debian/patches/series
=====================================
@@ -0,0 +1 @@
+no-rts-N


=====================================
p/haskell-secret-sharing/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-secret-sharing (1.0.1.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 20 Jul 2020 07:08:48 +0300
+
 haskell-secret-sharing (1.0.1.0-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
p/haskell-secret-sharing/debian/control
=====================================
@@ -28,8 +28,8 @@ Build-Depends-Indep:
  libghc-dice-entropy-conduit-doc,
  libghc-finite-field-doc,
  libghc-vector-doc,
-Standards-Version: 4.1.4
-Homepage: https://github.com/pwrobinson/secret-sharing
+Standards-Version: 4.5.0
+Homepage: https://github.com/pwrobinson/secret-sharing#readme
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-secret-sharing
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-secret-sharing]
 X-Description: (m, n)-threshold secret sharing scheme


=====================================
p/haskell-secret-sharing/debian/patches/missing-test-suite-deps.patch deleted
=====================================
@@ -1,20 +0,0 @@
-Author: Sean Whitton <spwhitton at spwhitton.name>
-Description: add missing test suite dependencies
-Forwarded: peter.robinson at monoid.at
-
----
---- a/secret-sharing.cabal
-+++ b/secret-sharing.cabal
-@@ -65,6 +65,11 @@ test-suite Main
-                    QuickCheck >= 2.4,
-                    secret-sharing,
-                    test-framework >= 0.4.1,
--                   test-framework-quickcheck2
-+                   test-framework-quickcheck2,
-+                   bytestring,
-+                   vector,
-+                   binary,
-+                   finite-field,
-+                   dice-entropy-conduit
-   hs-source-dirs:  tests
-   main-is:         Tests.hs


=====================================
p/haskell-secret-sharing/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-missing-test-suite-deps.patch


=====================================
p/haskell-snap/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-snap (1.1.3.0-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #964838)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 20 Jul 2020 08:06:33 +0300
+
 haskell-snap (1.1.2.0-1) unstable; urgency=medium
 
   * New upstream version.


=====================================
p/haskell-snap/debian/control
=====================================
@@ -34,13 +34,13 @@ Build-Depends:
  libghc-dlist-dev (>= 0.5),
  libghc-dlist-prof,
  libghc-hashable-dev (>= 1.2.0.6),
- libghc-hashable-dev (<< 1.3),
+ libghc-hashable-dev (<< 1.4),
  libghc-hashable-prof,
  libghc-heist-dev (>= 1.1),
  libghc-heist-dev (<< 1.2),
  libghc-heist-prof,
  libghc-lens-dev (>= 3.7.6),
- libghc-lens-dev (<< 4.18),
+ libghc-lens-dev (<< 4.19),
  libghc-lens-prof,
  libghc-lifted-base-dev (<< 0.3),
  libghc-lifted-base-dev (>= 0.2),
@@ -75,7 +75,7 @@ Build-Depends:
  libghc-hunit-dev (>= 1.2.5.2),
  libghc-hunit-dev (<< 1.7),
  libghc-quickcheck2-dev (>= 2.4.2),
- libghc-quickcheck2-dev (<< 2.13),
+ libghc-quickcheck2-dev (<< 2.14),
  libghc-quickcheck2-prof,
  libghc-aeson-dev,
  libghc-async-dev (>= 2.0.1.5),
@@ -131,7 +131,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-transformers-base-doc,
  libghc-unordered-containers-doc,
  libghc-xmlhtml-doc,
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
 Homepage: http://snapframework.com/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-snap
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-snap]


=====================================
p/haskell-snap/debian/patches/no-fail
=====================================
@@ -1,6 +1,6 @@
 --- a/snap.cabal
 +++ b/snap.cabal
-@@ -122,7 +122,6 @@
+@@ -123,7 +123,6 @@
      directory                 >= 1.1      && < 1.4,
      directory-tree            >= 0.10     && < 0.13,
      dlist                     >= 0.5      && < 0.9,
@@ -8,7 +8,7 @@
      filepath                  >= 1.3      && < 1.5,
      -- hashable is broken from 1.2.0.0 through 1.2.0.5
      -- snap does work with hashable 1.1.*, but some have complained that
-@@ -244,7 +243,6 @@
+@@ -245,7 +244,6 @@
      directory,
      directory-tree,
      dlist,


=====================================
p/haskell-snap/debian/patches/no-test-framework-smallcheck
=====================================
@@ -1,6 +1,6 @@
 --- a/snap.cabal
 +++ b/snap.cabal
-@@ -267,7 +267,6 @@
+@@ -268,7 +268,6 @@
      test-framework             >= 0.8.0.3  && < 0.9,
      test-framework-hunit       >= 0.3.0.1  && < 0.4,
      test-framework-quickcheck2 >= 0.3.0.3  && < 0.4,


=====================================
p/haskell-snap/debian/patches/rename-snap-binary
=====================================
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/snap.cabal
 +++ b/snap.cabal
-@@ -14,7 +14,7 @@ description:
+@@ -14,7 +14,7 @@
      @$ cabal install snap snap-templates
      $ mkdir myproject
      $ cd myproject


=====================================
p/haskell-streaming-commons/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-streaming-commons (0.2.1.2-2) unstable; urgency=medium
+
+  * Backport upstream patch to remove `AI_ADDRCONFIG` (Closes: #964400)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 20 Jul 2020 08:30:02 +0300
+
 haskell-streaming-commons (0.2.1.2-1) unstable; urgency=medium
 
   * New upstream release


=====================================
p/haskell-streaming-commons/debian/control
=====================================
@@ -28,7 +28,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-network-doc,
  libghc-random-doc,
  libghc-zlib-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Homepage: https://github.com/fpco/streaming-commons
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-streaming-commons
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-streaming-commons]


=====================================
p/haskell-streaming-commons/debian/patches/remove-ADDRCONFIG
=====================================
@@ -0,0 +1,28 @@
+From 628809101c490e7a63dcd0478daf59014fafaa4c Mon Sep 17 00:00:00 2001
+From: Michael Snoyman <michael at snoyman.com>
+Date: Sun, 19 Jul 2020 15:53:47 +0300
+Subject: [PATCH] Remove AI_ADDRCONFIG (fixes #58)
+
+--- a/Data/Streaming/Network.hs
++++ b/Data/Streaming/Network.hs
+@@ -120,8 +120,7 @@
+     NS.getAddrInfo (Just hints) (Just host') (Just $ show port')
+   where
+     hints = NS.defaultHints {
+-                NS.addrFlags = [NS.AI_ADDRCONFIG]
+-              , NS.addrSocketType = sockettype
++                NS.addrSocketType = sockettype
+               , NS.addrFamily = af
+               }
+ 
+@@ -157,9 +156,7 @@
+ bindPortGenEx :: [(NS.SocketOption, Int)] -> SocketType -> Int -> HostPreference -> IO Socket
+ bindPortGenEx sockOpts sockettype p s = do
+     let hints = NS.defaultHints
+-            { NS.addrFlags = [ NS.AI_PASSIVE
+-                             , NS.AI_ADDRCONFIG
+-                             ]
++            { NS.addrFlags = [NS.AI_PASSIVE]
+             , NS.addrSocketType = sockettype
+             }
+         host =


=====================================
p/haskell-streaming-commons/debian/patches/series
=====================================
@@ -0,0 +1 @@
+remove-ADDRCONFIG


=====================================
p/hlint/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+hlint (2.2.11-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 20 Jul 2020 08:15:30 +0300
+
 hlint (2.1.17-1) unstable; urgency=medium
 
   * New upstream release


=====================================
p/hlint/debian/control
=====================================
@@ -23,8 +23,15 @@ Build-Depends:
  libghc-data-default-prof,
  libghc-extra-dev (>= 1.6.6),
  libghc-extra-prof,
+ libghc-file-embed-dev,
+ libghc-file-embed-prof,
+ libghc-filepattern-dev (>= 0.1.1),
+ libghc-filepattern-prof,
+ libghc-ghc-lib-parser-ex-dev (>= 8.8.5),
+ libghc-ghc-lib-parser-ex-dev (<< 8.8.6),
+ libghc-ghc-lib-parser-ex-prof,
  libghc-src-exts-dev (>= 1.21),
- libghc-src-exts-dev (<< 1.23),
+ libghc-src-exts-dev (<< 1.24),
  libghc-src-exts-prof,
  libghc-src-exts-util-dev (>= 0.2.5),
  libghc-src-exts-util-prof,
@@ -36,6 +43,8 @@ Build-Depends:
  libghc-uniplate-prof,
  libghc-unordered-containers-dev,
  libghc-unordered-containers-prof,
+ libghc-utf8-string-dev,
+ libghc-utf8-string-prof,
  libghc-vector-dev,
  libghc-vector-prof,
  libghc-yaml-dev (>= 0.5.0),
@@ -47,6 +56,9 @@ Build-Depends-Indep: ghc-doc,
  libghc-cpphs-doc,
  libghc-data-default-doc,
  libghc-extra-doc,
+ libghc-file-embed-doc,
+ libghc-filepattern-doc,
+ libghc-ghc-lib-parser-ex-doc,
  libghc-src-exts-doc,
  libghc-src-exts-util-doc,
  libghc-hscolour-doc,
@@ -54,10 +66,11 @@ Build-Depends-Indep: ghc-doc,
  libghc-src-exts-doc,
  libghc-uniplate-doc,
  libghc-unordered-containers-doc,
+ libghc-utf8-string-doc,
  libghc-vector-doc,
  libghc-yaml-doc,
 Standards-Version: 4.5.0
-Homepage: http://community.haskell.org/~ndm/hlint/
+Homepage: https://github.com/ndmitchell/hlint#readme
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/hlint
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/hlint]
 


=====================================
p/hlint/debian/patches/newer-deps deleted
=====================================
@@ -1,11 +0,0 @@
---- a/hlint.cabal
-+++ b/hlint.cabal
-@@ -53,7 +53,7 @@
-         cpphs >= 1.20.1,
-         cmdargs >= 0.10,
-         yaml >= 0.5.0,
--        haskell-src-exts >= 1.21 && < 1.22,
-+        haskell-src-exts >= 1.21 && < 1.23,
-         haskell-src-exts-util >= 0.2.5,
-         uniplate >= 1.5,
-         ansi-terminal >= 0.6.2,


=====================================
p/hlint/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-newer-deps



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/c1873c450d59c1e2fd80e92605d19296e131c0b2...52a6a712d51e5e4be7550379e1e334283c987bb4

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/c1873c450d59c1e2fd80e92605d19296e131c0b2...52a6a712d51e5e4be7550379e1e334283c987bb4
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/20200720/ef14a426/attachment-0001.html>


More information about the Pkg-haskell-commits mailing list