[Git][haskell-team/package-plan][master] 3 commits: Update stylish-haskell to v0.11.0.0
Ilias Tsitsimpis
gitlab at salsa.debian.org
Sun Aug 2 12:50:20 BST 2020
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / package-plan
Commits:
648d4d7f by Ilias Tsitsimpis at 2020-08-02T10:29:51+03:00
Update stylish-haskell to v0.11.0.0
- - - - -
7695b63a by Ilias Tsitsimpis at 2020-08-02T14:25:34+03:00
Re-enable hgettext
- - - - -
7225f7b3 by Ilias Tsitsimpis at 2020-08-02T14:46:10+03:00
More removal notices
- - - - -
7 changed files:
- + additional-cabals/hgettext-0.1.31.0.cabal
- packages.txt
- + patches/hgettext/0.1.31.0/16.patch
- + patches/hgettext/0.1.31.0/new-containers
- + patches/hgettext/0.1.31.0/newer-deps
- + patches/hgettext/0.1.31.0/newer-src-exts
- + patches/hgettext/0.1.31.0/series
Changes:
=====================================
additional-cabals/hgettext-0.1.31.0.cabal
=====================================
@@ -0,0 +1,67 @@
+cabal-version: 1.14
+name: hgettext
+version: 0.1.31.0
+build-type: Simple
+
+license: BSD3
+license-file: LICENSE
+
+author: Vasyl Pasternak
+maintainer: Herbert Valerio Riedel
+copyright: 2009 Vasyl Pasternak
+category: Text
+bug-reports: https://github.com/hvr/hgettext/issues
+synopsis: Bindings to libintl.h (gettext, bindtextdomain)
+description: This package provides bindings to the @gettext@ internationalization and localization (i18n) library.
+ .
+ This package provides support for custom @Setup.hs@ scripts via the "Distribution.Simple.I18N.GetText" module.
+ .
+ A user-contributed tutorial can be found in the [Haskell Wiki](https://wiki.haskell.org/Internationalization_of_Haskell_programs_using_gettext).
+
+tested-with: GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
+
+source-repository head
+ type: git
+ location: https://github.com/hvr/hgettext.git
+
+library
+ default-language: Haskell2010
+ exposed-modules: Text.I18N.GetText,
+ Distribution.Simple.I18N.GetText
+ other-modules: Internal
+
+ hs-source-dirs: src
+ build-depends: base >=4.5 && <4.11
+ , Cabal >=1.14 && <1.25 || == 2.0.*
+ , containers >=0.4.2 && <0.6
+ , directory >=1.1 && <1.4
+ , filepath >=1.3 && <1.5
+ , process >=1.1 && <1.7
+ , setlocale >=0.0.3 && <1.1
+
+ ghc-options: -Wall
+
+ -- temporary hack: https://github.com/haskell-hvr/hgettext/pull/3
+ if os(windows)
+ extra-libraries: libintl
+
+executable hgettext
+ default-language: Haskell2010
+
+ main-is: hgettext.hs
+ other-modules: Paths_hgettext
+
+ hs-source-dirs: src-exe
+
+ -- constraints inherited from lib:hgettext
+ build-depends: hgettext
+ , base
+ , Cabal
+ , containers
+ , filepath
+
+ build-depends: deepseq >=1.1 && <1.5
+ , haskell-src-exts >=1.18 && <1.21
+ , uniplate >=1.6.12 && <1.7
+
+ ghc-options: -Wall
=====================================
packages.txt
=====================================
@@ -77,7 +77,7 @@ brick 0.52.1
brittany 0.12.1.1
broadcast-chan 0.2.1
bsb-http-chunked 0.0.0.4
-bustle 0.7.5 key binary -f-hgettext # hgettext is broken
+bustle 0.7.5 key binary
butcher 1.3.3.1
byteable 0.1.1
bytedump 1.0
@@ -332,7 +332,7 @@ ghc-lib-parser 8.8.3.20200412.1
ghc-lib-parser-ex 8.8.5.8
ghc-mtl 1.2.1.0
ghc-paths 0.1.0.12
-ghc-syb-utils 0.3.0.0 ignore # BROKEN: LTS 13: newer ghc
+ghc-syb-utils 0.3.0.0 ignore # https://bugs.debian.org/966708
gi-atk 2.0.21
gi-cairo 1.0.23
gi-cairo-connector 0.0.1
@@ -414,7 +414,7 @@ HDBC-odbc 2.5.0.1 ignore # https://bugs.debian.org/914353
HDBC-postgresql 2.3.2.7 key
HDBC-session 0.1.2.0
HDBC-sqlite3 2.3.3.1 key
-hdevtools 0.1.8.0 binary
+hdevtools 0.1.8.0 binary ignore # https://bugs.debian.org/964824
heaps 0.3.6.1
hedgehog 1.0.2
hedis 0.12.13 key notest
@@ -423,7 +423,7 @@ here 1.2.13
heredoc 0.2.0.0
heterocephalus 1.0.5.3
hex 0.1.2
-hgettext 0.1.31.0 ignore # BROKEN: LTS 13:
+hgettext 0.1.31.0
hierarchical-clustering 0.4.7
hi-file-parser 0.1.0.0
highlighting-kate 0.6.4 -fpcre-light ignore # https://bugs.debian.org/963737
@@ -916,7 +916,7 @@ stringbuilder 0.5.1 notest
string-conversions 0.4.0.1
stringprep 1.0.0
stringsearch 0.3.6.6
-stylish-haskell 0.10.0.0 binary=stylish-haskell
+stylish-haskell 0.11.0.0 binary=stylish-haskell ahead
svg-builder 0.1.1
swish 0.10.0.4 key notest
syb 0.7.1
@@ -1049,7 +1049,7 @@ vector-binary-instances 0.2.5.1
vector-builder 0.3.8 notest # missing deps
vector-instances 3.4
vector-space 0.16
-vector-space-points 0.2.1.2 ignore # BROKEN: base>=4.0 && <4.13
+vector-space-points 0.2.1.2 ignore # https://bugs.debian.org/966711
vector-th-unbox 0.2.1.7
void 0.7.3
vty 5.26 notest
=====================================
patches/hgettext/0.1.31.0/16.patch
=====================================
@@ -0,0 +1,67 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+From e930c5d0b1d9291f55a4f86d9bcdf51fcdb2cde3 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar at gmail.com>
+Date: Thu, 14 Mar 2019 12:49:07 +0100
+Subject: [PATCH] Fix build with cabal-2.4
+
+https://github.com/haskell-hvr/hgettext/issues/15
+---
+ src/Distribution/Simple/I18N/GetText.hs | 4 ++--
+ src/Internal.hs | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/src/Distribution/Simple/I18N/GetText.hs b/src/Distribution/Simple/I18N/GetText.hs
+index f2bc7c8..7f9f8a5 100644
+--- a/src/Distribution/Simple/I18N/GetText.hs
++++ b/src/Distribution/Simple/I18N/GetText.hs
+@@ -78,7 +78,7 @@ import Distribution.Simple
+ import Distribution.Simple.InstallDirs as I
+ import Distribution.Simple.LocalBuildInfo
+ import Distribution.Simple.Setup
+-import Distribution.Simple.Utils
++import Distribution.Simple.Utils (warn)
+ import Distribution.Verbosity
+
+ import Control.Arrow (second)
+@@ -90,7 +90,7 @@ import System.Exit
+ import System.FilePath
+ import System.Process
+
+-import Internal
++import Internal (fromPackageName, matchFileGlob)
+
+ -- | Default main function, same as
+ --
+diff --git a/src/Internal.hs b/src/Internal.hs
+index 69d3ea2..f1eb255 100644
+--- a/src/Internal.hs
++++ b/src/Internal.hs
+@@ -1,8 +1,14 @@
+ {-# LANGUAGE CPP #-}
+
+-module Internal where
++module Internal (fromPackageName, matchFileGlob) where
+
+ import Distribution.Simple
++#if MIN_VERSION_Cabal(2,4,0)
++import Distribution.Simple.Glob (matchDirFileGlob)
++import Distribution.Verbosity (silent)
++#else
++import Distribution.Simple.Utils (matchFileGlob)
++#endif
+
+ fromPackageName :: PackageName -> String
+ #if MIN_VERSION_Cabal(2,0,0)
+@@ -10,3 +16,10 @@ fromPackageName = unPackageName
+ #else
+ fromPackageName (PackageName s) = s
+ #endif
++
++#if MIN_VERSION_Cabal(2,4,0)
++-- | Newer versions of Cabal have removed this function in favour of more configurable implementation
++-- We assume Cabal 2.0
++matchFileGlob :: FilePath -> IO [FilePath]
++matchFileGlob = matchDirFileGlob silent (mkVersion [2, 0]) "."
++#endif
=====================================
patches/hgettext/0.1.31.0/new-containers
=====================================
@@ -0,0 +1,11 @@
+--- haskell-hgettext-0.1.31.0.orig/hgettext.cabal
++++ haskell-hgettext-0.1.31.0/hgettext.cabal
+@@ -33,7 +33,7 @@ library
+ hs-source-dirs: src
+ build-depends: base >=4.5 && <4.13
+ , Cabal >=1.14 && <1.25 || == 2.0.* || == 2.2.* || == 2.4.*
+- , containers >=0.4.2 && <0.6
++ , containers >=0.4.2 && <0.7
+ , directory >=1.1 && <1.4
+ , filepath >=1.3 && <1.5
+ , process >=1.1 && <1.7
=====================================
patches/hgettext/0.1.31.0/newer-deps
=====================================
@@ -0,0 +1,15 @@
+Index: b/hgettext.cabal
+===================================================================
+--- a/hgettext.cabal
++++ b/hgettext.cabal
+@@ -31,8 +31,8 @@ library
+ other-modules: Internal
+
+ hs-source-dirs: src
+- build-depends: base >=4.5 && <4.11
+- , Cabal >=1.14 && <1.25 || == 2.0.*
++ build-depends: base >=4.5 && <4.13
++ , Cabal >=1.14 && <1.25 || == 2.0.* || == 2.2.* || == 2.4.*
+ , containers >=0.4.2 && <0.6
+ , directory >=1.1 && <1.4
+ , filepath >=1.3 && <1.5
=====================================
patches/hgettext/0.1.31.0/newer-src-exts
=====================================
@@ -0,0 +1,22 @@
+--- a/hgettext.cabal
++++ b/hgettext.cabal
+@@ -31,8 +31,8 @@
+ other-modules: Internal
+
+ hs-source-dirs: src
+- build-depends: base >=4.5 && <4.13
+- , Cabal >=1.14 && <1.25 || == 2.0.* || == 2.2.* || == 2.4.*
++ build-depends: base >=4.5 && <5
++ , Cabal >=1.14
+ , containers >=0.4.2 && <0.7
+ , directory >=1.1 && <1.4
+ , filepath >=1.3 && <1.5
+@@ -61,7 +61,7 @@
+ , filepath
+
+ build-depends: deepseq >=1.1 && <1.5
+- , haskell-src-exts >=1.18 && <1.21
++ , haskell-src-exts >=1.18 && <1.23
+ , uniplate >=1.6.12 && <1.7
+
+ ghc-options: -Wall
=====================================
patches/hgettext/0.1.31.0/series
=====================================
@@ -0,0 +1,4 @@
+newer-deps
+16.patch
+new-containers
+newer-src-exts
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/fbe5037183c258fc8b7e0c23bdc483e384ef22fa...7225f7b3061d4487d1fa41deb6e70574b77cd9d9
--
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/fbe5037183c258fc8b7e0c23bdc483e384ef22fa...7225f7b3061d4487d1fa41deb6e70574b77cd9d9
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/20200802/c728f5da/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list