Skip to content
Commits on Source (17)
Show whitespace changes
Inline Side-by-side
p/haskell-hackage-security/debian/patches/new-directory.patch deleted 100644 → 0
View file @ 2c1a5281
--- haskell-hackage-security-0.5.2.2.orig/hackage-security.cabal
+++ haskell-hackage-security-0.5.2.2/hackage-security.cabal
@@ -101,7 +101,7 @@ library
bytestring >= 0.9 && < 0.11,
Cabal >= 1.14 && < 1.26,
containers >= 0.4 && < 0.6,
- directory >= 1.1.0.2 && < 1.3,
+ directory >= 1.1.0.2 && < 1.4,
ed25519 >= 0.0 && < 0.1,
filepath >= 1.2 && < 1.5,
mtl >= 2.2 && < 2.3,
p/haskell-hackage-security/debian/patches/use-cryptohash deleted 100644 → 0
View file @ 2c1a5281
--- a/hackage-security.cabal
+++ b/hackage-security.cabal
@@ -107,7 +107,7 @@
mtl >= 2.2 && < 2.3,
parsec >= 3.1 && < 3.2,
pretty >= 1.0 && < 1.2,
- cryptohash-sha256 >= 0.11 && < 0.12,
+ cryptohash,
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
-- functionality, 0.5.0 changes type of serialise
tar >= 0.5 && < 0.6,
p/haskell-hledger-lib/debian/patches/newer-megaparsec deleted 100644 → 0
View file @ 2c1a5281
Index: b/hledger-lib.cabal
===================================================================
--- a/hledger-lib.cabal
+++ b/hledger-lib.cabal
@@ -71,7 +71,7 @@ library
, directory
, filepath
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.3
+ , megaparsec >=5.0 && < 5.4
, mtl
, old-time
, pretty-show >=1.6.4
@@ -164,7 +164,7 @@ test-suite doctests
, directory
, filepath
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.3
+ , megaparsec >=5.0 && < 5.4
, mtl
, old-time
, pretty-show >=1.6.4
@@ -248,7 +248,7 @@ test-suite hunittests
, directory
, filepath
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.3
+ , megaparsec >=5.0 && < 5.4
, mtl
, old-time
, pretty-show >=1.6.4
p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch
View file @ e57b965d
--- a/hledger-lib.cabal --- a/hledger-lib.cabal
+++ b/hledger-lib.cabal +++ b/hledger-lib.cabal
@@ -73,7 +73,6 @@ library @@ -120,7 +120,6 @@
, hashtables >=1.2 , hashtables >=1.2
, megaparsec >=5.0 && < 5.3 , megaparsec >=5.0
, mtl , mtl
- , mtl-compat - , mtl-compat
, old-time , old-time
, parsec >=3
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, regex-tdfa @@ -212,7 +211,6 @@
@@ -167,7 +166,6 @@ test-suite doctests
, hashtables >=1.2 , hashtables >=1.2
, megaparsec >=5.0 && < 5.3 , megaparsec >=5.0
, mtl , mtl
- , mtl-compat - , mtl-compat
, old-time , old-time
, parsec >=3
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, regex-tdfa @@ -303,7 +301,6 @@
@@ -252,7 +250,6 @@ test-suite hunittests , hledger-lib
, hashtables >= 1.2 , megaparsec >=5.0
, megaparsec >=5.0 && < 5.3
, mtl , mtl
- , mtl-compat - , mtl-compat
, old-time , old-time
, parsec >=3
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, regex-tdfa
p/haskell-hledger-lib/debian/patches/series
View file @ e57b965d
no-mtl-compat.patch no-mtl-compat.patch
newer-megaparsec
p/haskell-hledger-ui/debian/patches/new-metadata-from-hackage deleted 100644 → 0
View file @ 2c1a5281
Index: b/hledger-ui.cabal
===================================================================
--- a/hledger-ui.cabal
+++ b/hledger-ui.cabal
@@ -72,7 +72,7 @@ executable hledger-ui
, HUnit
, microlens >= 0.4 && < 0.5
, microlens-platform >= 0.2.3.1 && < 0.4
- , megaparsec >=5.0 && < 5.3
+ , megaparsec >=5.0 && < 5.4
, pretty-show >=1.6.4
, process >= 1.2
, safe >= 0.2
@@ -85,8 +85,8 @@ executable hledger-ui
buildable: False
else
build-depends:
- brick >= 0.12 && < 0.18
- , vty >= 5.5 && < 5.16
+ brick >= 0.12 && < 0.19
+ , vty >= 5.5 && < 5.17
if flag(threaded)
ghc-options: -threaded
if flag(oldtime)
p/haskell-hledger-web/debian/patches/newer-megaparsec deleted 100644 → 0
View file @ 2c1a5281
Index: b/hledger-web.cabal
===================================================================
--- a/hledger-web.cabal
+++ b/hledger-web.cabal
@@ -159,7 +159,7 @@ library
, yesod-form
, yesod-static
, json
- , megaparsec >=5.0 && < 5.3
+ , megaparsec >=5.0 && < 5.4
, mtl
if (flag(dev)) || (flag(library-only))
cpp-options: -DDEVELOPMENT
p/haskell-hledger/debian/patches/newer-megaparsec deleted 100644 → 0
View file @ 2c1a5281
Index: b/hledger.cabal
===================================================================
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -104,7 +104,7 @@ library
, HUnit
, mtl
, old-time
- , megaparsec >=5.0 && < 5.3
+ , megaparsec >=5.0 && < 5.4
, regex-tdfa
, safe >=0.2
, split >=0.1 && <0.3
p/haskell-hledger/debian/patches/no-mtl-compat.patch
View file @ e57b965d
--- a/hledger.cabal --- a/hledger.cabal
+++ b/hledger.cabal +++ b/hledger.cabal
@@ -103,7 +103,6 @@ library @@ -99,7 +99,6 @@
, haskeline >=0.6 && <=0.8 , hledger-lib >=1.5 && <1.6
, HUnit , megaparsec >=5.0
, mtl , mtl
- , mtl-compat - , mtl-compat
, old-time , old-time
, megaparsec >=5.0 && < 5.3 , pretty-show >=1.6.4
, regex-tdfa , process
@@ -188,7 +187,6 @@ executable hledger @@ -179,7 +178,6 @@
, haskeline >=0.6 && <=0.8 , hledger
, HUnit , hledger-lib >=1.5 && <1.6
, mtl , mtl
- , mtl-compat - , mtl-compat
, old-time , old-time
, parsec >=3 , parsec >=3
, regex-tdfa , pretty-show >=1.6.4
@@ -250,7 +248,6 @@ test-suite test @@ -231,7 +229,6 @@
, haskeline >=0.6 && <=0.8 , hledger
, HUnit , hledger-lib >=1.5 && <1.6
, mtl , mtl
- , mtl-compat - , mtl-compat
, old-time , old-time
, parsec >=3 , parsec >=3
, regex-tdfa , pretty-show >=1.6.4
p/haskell-hledger/debian/patches/series
View file @ e57b965d
no-mtl-compat.patch no-mtl-compat.patch
newer-megaparsec
p/haskell-hs-bibutils/debian/patches/bibutils-include-path
View file @ e57b965d
...@@ -3,22 +3,18 @@ Description: fix include paths ...@@ -3,22 +3,18 @@ Description: fix include paths
for in bibutils/ for in bibutils/
Author: Joachim Breitner <nomeata@debian.org> Author: Joachim Breitner <nomeata@debian.org>
--- haskell-hs-bibutils-4.12.orig/src/Text/Bibutils.hsc --- a/src/Text/Bibutils.hsc
+++ haskell-hs-bibutils-4.12/src/Text/Bibutils.hsc +++ b/src/Text/Bibutils.hsc
@@ -403,9 +403,9 @@ newtype BiblioOut = BiblioOut { unBiblio @@ -402,7 +402,7 @@
newtype FormatOpt = FormatOpt { unFormatOpt :: CInt } newtype FormatOpt = FormatOpt { unFormatOpt :: CInt }
-#include "bibtexout.h" -#include "bibutils.h"
-#include "modsout.h" +#include "bibutils/bibutils.h"
-#include "wordout.h"
+#include "bibutils/bibtexout.h"
+#include "bibutils/modsout.h"
+#include "bibutils/wordout.h"
#{enum FormatOpt, FormatOpt #{enum FormatOpt, FormatOpt
, bibout_finalcomma = BIBOUT_FINALCOMMA , bibout_finalcomma = BIBL_FORMAT_BIBOUT_FINALCOMMA
@@ -441,8 +441,8 @@ newtype Charset = Charset { charset :: C @@ -437,8 +437,8 @@
combineFormatOpts :: [FormatOpt] -> FormatOpt combineFormatOpts :: [FormatOpt] -> FormatOpt
combineFormatOpts = FormatOpt . foldr ((.|.) . unFormatOpt) 0 combineFormatOpts = FormatOpt . foldr ((.|.) . unFormatOpt) 0
......
p/haskell-hs-bibutils/debian/patches/fix_cabal.patch
View file @ e57b965d
...@@ -6,80 +6,73 @@ Last-Update: 2011-08-13 ...@@ -6,80 +6,73 @@ Last-Update: 2011-08-13
The .cabal files instructs the compiler to use the embedded bibutils The .cabal files instructs the compiler to use the embedded bibutils
library. This patch makes it use the Debian packaged one. library. This patch makes it use the Debian packaged one.
Index: hs-bibutils-5.5/hs-bibutils.cabal --- a/hs-bibutils.cabal
=================================================================== +++ b/hs-bibutils.cabal
--- hs-bibutils-5.5.orig/hs-bibutils.cabal 2015-05-23 21:53:27.774221614 +0200 @@ -26,37 +26,6 @@
+++ hs-bibutils-5.5/hs-bibutils.cabal 2015-05-23 21:53:33.062278578 +0200 maintainer: Václav Haisman <vhaisman@gmail.com>
@@ -29,42 +29,6 @@ cabal-version: >= 1.16
maintainer: andrea.rossato@unitn.it
cabal-version: >= 1.4
build-type: Simple build-type: Simple
-extra-source-files: -extra-source-files:
- bibutils/adsout.c bibutils/adsout.h bibutils/adsout_journals.c - bibutils/adsout.c bibutils/adsout_journals.c bibutils/bibcore.c
- bibutils/bibcore.c bibutils/bibl.c bibutils/bibl.h - bibutils/bibformats.h bibutils/biblatexin.c bibutils/bibl.c
- bibutils/biblatexin.c bibutils/biblatexin.h - bibutils/bibl.h bibutils/bibtexin.c bibutils/bibtexout.c
- bibutils/bibtexin.c bibutils/bibtexin.h bibutils/bibtexout.c - bibutils/bibtextypes.c bibutils/bibutils.c bibutils/bibutils.h
- bibutils/bibtexout.h bibutils/bibtextypes.c - bibutils/bltypes.c bibutils/charsets.c bibutils/charsets.h
- bibutils/bibutils.c bibutils/bibutils.h bibutils/bltypes.c - bibutils/copacin.c bibutils/copactypes.c bibutils/ebiin.c
- bibutils/charsets.c bibutils/charsets.h bibutils/copacin.c - bibutils/endin.c bibutils/endout.c bibutils/endtypes.c
- bibutils/copacin.h bibutils/copactypes.c bibutils/doi.c - bibutils/endxmlin.c bibutils/entities.c bibutils/entities.h
- bibutils/doi.h bibutils/ebiin.c bibutils/ebiin.h
- bibutils/endin.c bibutils/endin.h bibutils/endout.c
- bibutils/endout.h bibutils/endtypes.c bibutils/endxmlin.c
- bibutils/endxmlin.h bibutils/entities.c bibutils/entities.h
- bibutils/fields.c bibutils/fields.h bibutils/gb18030.c - bibutils/fields.c bibutils/fields.h bibutils/gb18030.c
- bibutils/gb18030.h bibutils/gb18030_enumeration.c - bibutils/gb18030_enumeration.c bibutils/gb18030.h bibutils/generic.c
- bibutils/intlist.c bibutils/intlist.h bibutils/is_ws.c - bibutils/generic.h bibutils/intlist.c bibutils/intlist.h
- bibutils/is_ws.h bibutils/isiin.c bibutils/isiin.h - bibutils/isiin.c bibutils/isiout.c bibutils/isitypes.c
- bibutils/isiout.c bibutils/isiout.h bibutils/isitypes.c
- bibutils/iso639_1.c bibutils/iso639_1.h bibutils/iso639_2.c - bibutils/iso639_1.c bibutils/iso639_1.h bibutils/iso639_2.c
- bibutils/iso639_2.h bibutils/iso639_3.c bibutils/iso639_3.h - bibutils/iso639_2.h bibutils/iso639_3.c bibutils/iso639_3.h
- bibutils/latex.c bibutils/latex.h bibutils/list.c - bibutils/is_ws.c bibutils/is_ws.h bibutils/latex.c bibutils/latex.h
- bibutils/list.h bibutils/marc.c bibutils/marc.h - bibutils/marc.c bibutils/marc.h bibutils/medin.c bibutils/modsin.c
- bibutils/medin.c bibutils/medin.h bibutils/modsin.c - bibutils/modsout.c bibutils/modstypes.c bibutils/modstypes.h
- bibutils/modsin.h bibutils/modsout.c bibutils/modsout.h - bibutils/name.c bibutils/name.h bibutils/nbibin.c
- bibutils/modstypes.c bibutils/modstypes.h bibutils/name.c - bibutils/nbibtypes.c bibutils/notes.c bibutils/notes.h
- bibutils/name.h bibutils/newstr.c bibutils/newstr.h - bibutils/pages.c bibutils/pages.h bibutils/reftypes.c
- bibutils/newstr_conv.c bibutils/newstr_conv.h - bibutils/reftypes.h bibutils/risin.c bibutils/risout.c
- bibutils/reftypes.c bibutils/reftypes.h bibutils/risin.c
- bibutils/risin.h bibutils/risout.c bibutils/risout.h
- bibutils/ristypes.c bibutils/serialno.c bibutils/serialno.h - bibutils/ristypes.c bibutils/serialno.c bibutils/serialno.h
- bibutils/strsearch.c bibutils/strsearch.h bibutils/title.c - bibutils/slist.c bibutils/slist.h bibutils/str.c bibutils/str_conv.c
- bibutils/title.h bibutils/unicode.c bibutils/unicode.h - bibutils/str_conv.h bibutils/str.h bibutils/strsearch.c
- bibutils/utf8.c bibutils/utf8.h bibutils/vplist.c - bibutils/strsearch.h bibutils/title.c bibutils/title.h
- bibutils/vplist.h bibutils/wordin.c bibutils/wordin.h - bibutils/unicode.c bibutils/unicode.h bibutils/url.c bibutils/url.h
- bibutils/wordout.c bibutils/wordout.h bibutils/xml.c - bibutils/utf8.c bibutils/utf8.h bibutils/vplist.c bibutils/vplist.h
- bibutils/xml.h bibutils/xml_encoding.c bibutils/xml_encoding.h - bibutils/wordin.c bibutils/wordout.c bibutils/xml.c
- bibutils/xml_encoding.c bibutils/xml_encoding.h bibutils/xml.h
- README.md ChangeLog.md
library library
exposed-modules: Text.Bibutils default-language: Haskell2010
@@ -73,29 +37,9 @@ @@ -66,29 +35,7 @@
ghc-prof-options: -prof -auto-all
hs-source-dirs: src hs-source-dirs: src
extensions: ForeignFunctionInterface default-extensions: ForeignFunctionInterface
- include-dirs: bibutils include-dirs: bibutils
- includes: bibutils.h - includes: bibutils.h
c-sources: - c-sources:
cbits/stub.c - cbits/stub.c
- bibutils/adsout.c bibutils/adsout_journals.c - bibutils/adsout.c bibutils/bibcore.c
- bibutils/bibcore.c bibutils/bibl.c bibutils/biblatexin.c - bibutils/biblatexin.c bibutils/bibl.c bibutils/bibtexin.c
- bibutils/bibtexin.c bibutils/bibtexout.c - bibutils/bibtexout.c bibutils/bibtextypes.c bibutils/bibutils.c
- bibutils/bibtextypes.c bibutils/bibutils.c bibutils/bltypes.c - bibutils/bltypes.c bibutils/charsets.c bibutils/copacin.c
- bibutils/charsets.c bibutils/copacin.c bibutils/copactypes.c - bibutils/copactypes.c bibutils/ebiin.c bibutils/endin.c
- bibutils/doi.c bibutils/ebiin.c bibutils/endin.c
- bibutils/endout.c bibutils/endtypes.c bibutils/endxmlin.c - bibutils/endout.c bibutils/endtypes.c bibutils/endxmlin.c
- bibutils/entities.c bibutils/fields.c bibutils/gb18030.c - bibutils/entities.c bibutils/fields.c bibutils/gb18030.c
- bibutils/intlist.c bibutils/is_ws.c bibutils/isiin.c - bibutils/generic.c bibutils/intlist.c
- bibutils/isiout.c bibutils/isitypes.c bibutils/iso639_1.c - bibutils/isiin.c bibutils/isiout.c bibutils/isitypes.c
- bibutils/iso639_2.c bibutils/iso639_3.c bibutils/latex.c - bibutils/iso639_1.c bibutils/iso639_2.c bibutils/iso639_3.c
- bibutils/list.c bibutils/marc.c bibutils/medin.c - bibutils/is_ws.c bibutils/latex.c bibutils/marc.c bibutils/medin.c
- bibutils/modsin.c bibutils/modsout.c bibutils/modstypes.c - bibutils/modsin.c bibutils/modsout.c bibutils/modstypes.c
- bibutils/name.c bibutils/newstr.c bibutils/newstr_conv.c - bibutils/name.c bibutils/nbibin.c bibutils/nbibtypes.c
- bibutils/reftypes.c bibutils/risin.c bibutils/risout.c - bibutils/notes.c bibutils/pages.c bibutils/reftypes.c
- bibutils/ristypes.c bibutils/serialno.c bibutils/strsearch.c - bibutils/risin.c bibutils/risout.c bibutils/ristypes.c
- bibutils/title.c bibutils/unicode.c bibutils/utf8.c - bibutils/serialno.c bibutils/slist.c bibutils/str.c
- bibutils/vplist.c bibutils/wordin.c bibutils/wordout.c - bibutils/str_conv.c bibutils/strsearch.c bibutils/title.c
- bibutils/xml.c bibutils/xml_encoding.c - bibutils/unicode.c bibutils/url.c bibutils/utf8.c bibutils/vplist.c
- bibutils/wordin.c bibutils/wordout.c bibutils/xml.c
- bibutils/xml_encoding.c
+ pkgconfig-depends: bibutils + pkgconfig-depends: bibutils
if impl(ghc >= 6.10) if impl(ghc >= 6.10)
......
p/haskell-hslua/debian/control
View file @ e57b965d
...@@ -16,9 +16,6 @@ Build-Depends: ...@@ -16,9 +16,6 @@ Build-Depends:
libghc-exceptions-dev (>= 0.8), libghc-exceptions-dev (>= 0.8),
libghc-exceptions-dev (<< 0.10), libghc-exceptions-dev (<< 0.10),
libghc-exceptions-prof, libghc-exceptions-prof,
libghc-fail-dev (>= 4.9),
libghc-fail-dev (<< 5),
libghc-fail-prof,
libghc-mtl-dev (>= 2.2), libghc-mtl-dev (>= 2.2),
libghc-mtl-dev (<< 2.3), libghc-mtl-dev (<< 2.3),
libghc-mtl-prof, libghc-mtl-prof,
......
p/haskell-hslua/debian/patches/system-lua.diff
View file @ e57b965d
--- a/hslua.cabal --- a/hslua.cabal
+++ b/hslua.cabal +++ b/hslua.cabal
@@ -31,7 +31,7 @@ @@ -35,7 +35,7 @@
flag system-lua flag system-lua
description: Use the system-wide Lua instead of the bundled copy description: Use the system-wide Lua instead of the bundled copy.
- default: False - default: False
+ default: True + default: True
flag apicheck flag apicheck
description: Compile Lua with -DLUA_USE_APICHECK. description: Compile Lua with -DLUA_USE_APICHECK.
@@ -39,7 +39,7 @@ @@ -59,7 +59,7 @@
flag luajit flag luajit
description: Link with LuaJIT (should be used with -fsystem-lua) description: Link with LuaJIT. This implies flag system-lua as well.
- default: False
+ default: True
flag lua501
description: Build against lua 5.1.
@@ -71,7 +71,7 @@
flag use-pkgconfig
description: Build using pkg-config to discover library and include paths. This is only used with system-lua and luajit.
- default: False - default: False
+ default: True + default: True
library library
build-depends: base == 4.*, bytestring >= 0.10.2.0 && < 0.11 build-depends: base >= 4.7 && < 5
@@ -48,10 +48,9 @@ @@ -104,7 +104,7 @@
ghc-options: -Wall -O2 include-dirs: safer-api
if flag(system-lua)
if flag(luajit) if flag(luajit)
- Extra-libraries: luajit-5.1 if flag(use-pkgconfig)
+ Pkgconfig-depends: lua5.1, luajit - pkgconfig-depends: luajit
+ pkgconfig-depends: luajit, lua5.1
else else
- Extra-libraries: lua Extra-libraries: luajit-5.1
- includes: lua.h
+ Pkgconfig-depends: lua5.1
else else
c-sources: lua-5.1.5/lobject.c, lua-5.1.5/ltm.c, lua-5.1.5/ldblib.c,
lua-5.1.5/ldo.c, lua-5.1.5/lvm.c, lua-5.1.5/ltable.c,
p/haskell-hspec/debian/patches/no-hspec-discover
View file @ e57b965d
...@@ -4,19 +4,19 @@ control/debian. ...@@ -4,19 +4,19 @@ control/debian.
--- a/hspec.cabal --- a/hspec.cabal
+++ b/hspec.cabal +++ b/hspec.cabal
@@ -45,7 +45,6 @@ library @@ -50,7 +50,6 @@
build-depends: , base ==4.*
base == 4.* , call-stack
, hspec-core == 2.4.4 , hspec-core ==2.4.8
- , hspec-discover == 2.4.4 - , hspec-discover ==2.4.8
, hspec-expectations ==0.8.2.* , hspec-expectations ==0.8.2.*
, transformers >=0.2.2.0 , transformers >=0.2.2.0
, QuickCheck >= 2.5.1 exposed-modules:
@@ -76,7 +75,6 @@ test-suite spec @@ -84,7 +83,6 @@
build-depends: , directory
base == 4.* , hspec
, hspec-core == 2.4.4 , hspec-core ==2.4.8
- , hspec-discover == 2.4.4 - , hspec-discover ==2.4.8
, hspec-expectations ==0.8.2.* , hspec-expectations ==0.8.2.*
, transformers >= 0.2.2.0 , hspec-meta >=2.3.2
, QuickCheck >= 2.5.1 , stringbuilder
p/haskell-http-api-data/debian/patches/disable-doctests
View file @ e57b965d
--- a/http-api-data.cabal --- a/http-api-data.cabal
+++ b/http-api-data.cabal +++ b/http-api-data.cabal
@@ -83,18 +83,6 @@ @@ -87,18 +87,6 @@
, bytestring , bytestring
, uuid , uuid
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- build-depends: - build-depends:
- base, - base,
- directory >= 1.0, - directory >= 1.0,
- doctest >= 0.11 && <0.12, - doctest >= 0.11 && <0.14,
- filepath - filepath
- default-language: Haskell2010 - default-language: Haskell2010
- hs-source-dirs: test - hs-source-dirs: test
......