[Pkg-haskell-commits] [package-plan] 01/01: Create a working LTS-2.10 plan

Joachim Breitner nomeata at moszumanska.debian.org
Sun May 31 09:47:28 UTC 2015


This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch LTS-2.10
in repository package-plan.

commit a088cbe31658778f09a7c3b6153aa1a0ec3d894e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun May 31 11:46:52 2015 +0200

    Create a working LTS-2.10 plan
    
    using --assume-lts
---
 .../0.2.1.0/no-bytestring-builder                  | 13 +++++++++
 patches/blaze-builder-enumerator/0.2.1.0/series    |  1 +
 patches/conduit-extra/1.1.8/no-bytestring-builder  | 14 +++++++++
 patches/conduit-extra/1.1.8/series                 |  1 +
 .../2.1.4/faster-pwstore.diff                      | 15 ++++++++++
 patches/happstack-authenticate/2.1.4/series        |  1 +
 patches/hledger/0.24.1/no-shakespeare-text         | 34 ++++++++++++++++++++++
 patches/hledger/0.24.1/series                      |  1 +
 .../leksah-server/0.15.0.1/no-attoparsec-conduit   | 31 ++++++++++++++++++++
 patches/leksah-server/0.15.0.1/series              |  1 +
 patches/leksah/0.15.0.1/no-hamlet                  | 13 +++++++++
 patches/leksah/0.15.0.1/series                     |  1 +
 .../0.10.0.2/{new-mtl => extend-dependencies}      | 10 ++++---
 patches/snap-loader-dynamic/0.10.0.2/series        |  2 +-
 patches/tasty/0.10.1.2/regex-tdfa.diff             | 13 +++++++++
 patches/tasty/0.10.1.2/series                      |  1 +
 patches/xmonad/0.11.1/newer-utf8-string            | 13 +++++++++
 patches/xmonad/0.11.1/series                       |  1 +
 18 files changed, 161 insertions(+), 5 deletions(-)

diff --git a/patches/blaze-builder-enumerator/0.2.1.0/no-bytestring-builder b/patches/blaze-builder-enumerator/0.2.1.0/no-bytestring-builder
new file mode 100644
index 0000000..d874971
--- /dev/null
+++ b/patches/blaze-builder-enumerator/0.2.1.0/no-bytestring-builder
@@ -0,0 +1,13 @@
+Index: blaze-builder-enumerator-0.2.1.0/blaze-builder-enumerator.cabal
+===================================================================
+--- blaze-builder-enumerator-0.2.1.0.orig/blaze-builder-enumerator.cabal	2015-05-31 11:43:30.530928182 +0200
++++ blaze-builder-enumerator-0.2.1.0/blaze-builder-enumerator.cabal	2015-05-31 11:44:16.835928369 +0200
+@@ -50,7 +50,7 @@
+ 
+   if flag(newbuilder)
+       Build-depends:
+-          bytestring-builder >= 0.10.4 && <0.11
++          bytestring >= 0.10.4
+         , blaze-builder >= 0.4 && <0.5
+   else
+       Build-depends:
diff --git a/patches/blaze-builder-enumerator/0.2.1.0/series b/patches/blaze-builder-enumerator/0.2.1.0/series
new file mode 100644
index 0000000..d61cbb2
--- /dev/null
+++ b/patches/blaze-builder-enumerator/0.2.1.0/series
@@ -0,0 +1 @@
+no-bytestring-builder
diff --git a/patches/conduit-extra/1.1.8/no-bytestring-builder b/patches/conduit-extra/1.1.8/no-bytestring-builder
new file mode 100644
index 0000000..3b222db
--- /dev/null
+++ b/patches/conduit-extra/1.1.8/no-bytestring-builder
@@ -0,0 +1,14 @@
+Index: conduit-extra-1.1.7.1/conduit-extra.cabal
+===================================================================
+--- conduit-extra-1.1.7.1.orig/conduit-extra.cabal	2015-04-06 13:33:45.464741391 +0200
++++ conduit-extra-1.1.7.1/conduit-extra.cabal	2015-04-06 13:34:57.374338797 +0200
+@@ -70,8 +70,7 @@
+                    , async
+                    , attoparsec
+                    , blaze-builder
+-                   , bytestring-builder
+-                   , bytestring
++                   , bytestring >= 0.10.4
+                    , exceptions
+                    , process
+                    , resourcet
diff --git a/patches/conduit-extra/1.1.8/series b/patches/conduit-extra/1.1.8/series
new file mode 100644
index 0000000..d61cbb2
--- /dev/null
+++ b/patches/conduit-extra/1.1.8/series
@@ -0,0 +1 @@
+no-bytestring-builder
diff --git a/patches/happstack-authenticate/2.1.4/faster-pwstore.diff b/patches/happstack-authenticate/2.1.4/faster-pwstore.diff
new file mode 100644
index 0000000..03d541c
--- /dev/null
+++ b/patches/happstack-authenticate/2.1.4/faster-pwstore.diff
@@ -0,0 +1,15 @@
+pwstore-fast is already in Debian and is reportedly much faster.
+
+Index: happstack-authenticate-2.1.4/happstack-authenticate.cabal
+===================================================================
+--- happstack-authenticate-2.1.4.orig/happstack-authenticate.cabal	2015-05-31 10:51:04.031559843 +0200
++++ happstack-authenticate-2.1.4/happstack-authenticate.cabal	2015-05-31 10:51:04.027559792 +0200
+@@ -66,7 +66,7 @@
+                        mime-mail                    >= 0.4  && < 0.5,
+                        mtl                          >= 2.0  && < 2.3,
+                        lens                         >= 4.2  && < 4.10,
+-                       pwstore-purehaskell          == 2.1.*,
++                       pwstore-fast,
+                        text                         >= 0.11 && < 1.3,
+                        time                         >= 1.2  && < 1.6,
+                        random                       >= 1.0  && < 1.2,
diff --git a/patches/happstack-authenticate/2.1.4/series b/patches/happstack-authenticate/2.1.4/series
new file mode 100644
index 0000000..d1ea239
--- /dev/null
+++ b/patches/happstack-authenticate/2.1.4/series
@@ -0,0 +1 @@
+faster-pwstore.diff
diff --git a/patches/hledger/0.24.1/no-shakespeare-text b/patches/hledger/0.24.1/no-shakespeare-text
new file mode 100644
index 0000000..dc955ec
--- /dev/null
+++ b/patches/hledger/0.24.1/no-shakespeare-text
@@ -0,0 +1,34 @@
+Index: hledger-0.24/hledger.cabal
+===================================================================
+--- hledger-0.24.orig/hledger.cabal	2015-02-10 14:14:50.649114663 +0100
++++ hledger-0.24/hledger.cabal	2015-02-10 14:14:50.641114510 +0100
+@@ -92,8 +92,7 @@
+ -- and shakespeare. When you're ready to drop backwards compatibility,
+ -- simply put a lower bound of >= 2.0 on shakespeare and remove the
+ -- deprecated packages.
+-                 ,shakespeare-text >= 1.0 && < 1.2
+-                 ,shakespeare      >= 1.0 && < 2.1
++                 ,shakespeare      >= 2.0 && < 2.1
+                  ,split >= 0.1 && < 0.3
+                  ,text >= 0.11
+                  ,tabular >= 0.2 && < 0.3
+@@ -134,8 +133,7 @@
+                  ,regex-tdfa
+                  ,regexpr >= 0.5.1
+                  ,safe >= 0.2
+-                 ,shakespeare-text >= 1.0 && < 1.2
+-                 ,shakespeare      >= 1.0 && < 2.1
++                 ,shakespeare      >= 2.0 && < 2.1
+                  ,split >= 0.1 && < 0.3
+                  ,tabular >= 0.2 && < 0.3
+                  ,text >= 0.11
+@@ -173,8 +171,7 @@
+                , regex-tdfa
+                , regexpr
+                , safe
+-               , shakespeare-text >= 1.0 && < 1.2
+-               , shakespeare      >= 1.0 && < 2.1
++               , shakespeare      >= 2.0 && < 2.1
+                , split
+                ,tabular >= 0.2 && < 0.3
+                , test-framework
diff --git a/patches/hledger/0.24.1/series b/patches/hledger/0.24.1/series
new file mode 100644
index 0000000..d69449a
--- /dev/null
+++ b/patches/hledger/0.24.1/series
@@ -0,0 +1 @@
+no-shakespeare-text
diff --git a/patches/leksah-server/0.15.0.1/no-attoparsec-conduit b/patches/leksah-server/0.15.0.1/no-attoparsec-conduit
new file mode 100644
index 0000000..ad2e491
--- /dev/null
+++ b/patches/leksah-server/0.15.0.1/no-attoparsec-conduit
@@ -0,0 +1,31 @@
+Index: leksah-server-0.15.0.1/leksah-server.cabal
+===================================================================
+--- leksah-server-0.15.0.1.orig/leksah-server.cabal	2015-05-31 11:26:10.366004834 +0200
++++ leksah-server-0.15.0.1/leksah-server.cabal	2015-05-31 11:26:37.794519976 +0200
+@@ -41,7 +41,7 @@
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.6, deepseq >=1.1 && <1.5,
+                hslogger >= 1.0.7 && <1.3, conduit >= 1.0.8 && <1.3,
+                conduit-extra >=1.0.0.1 && <1.2, resourcet,
+-               attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.14,
++               attoparsec >=0.10.0.3 && <0.14,
+                transformers >=0.2.2.0 && <0.5, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.3,
+                HTTP >=4000.1.2 && <4000.3
+     if (impl(ghc >= 7.10))
+@@ -103,7 +103,7 @@
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.6, deepseq >=1.1 && <1.5,
+                hslogger >= 1.0.7 && <1.3, conduit >= 1.0.8 && <1.3,
+                conduit-extra >=1.0.0.1 && <1.2, resourcet,
+-               attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.14,
++               attoparsec >=0.10.0.3 && <0.14,
+                transformers >=0.2.2.0 && <0.5, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.3,
+                HTTP >=4000.1.2 && <4000.3
+     if (impl(ghc >= 7.10))
+@@ -169,7 +169,7 @@
+     build-depends:  base >= 4.0.0.0 && <4.9, hslogger >= 1.0.7 && <1.3, deepseq >=1.1 && <1.5,
+                bytestring >=0.9.0.1 && <0.11, conduit >= 1.0.8 && <1.3,
+                conduit-extra >=1.0.0.1 && <1.2, resourcet,
+-               attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.14,
++               attoparsec >=0.10.0.3 && <0.14,
+                transformers >=0.2.2.0 && <0.5, text >=0.11.3.1 && <1.3
+ 
+     if (impl(ghc >= 7.2))
diff --git a/patches/leksah-server/0.15.0.1/series b/patches/leksah-server/0.15.0.1/series
new file mode 100644
index 0000000..622fa67
--- /dev/null
+++ b/patches/leksah-server/0.15.0.1/series
@@ -0,0 +1 @@
+no-attoparsec-conduit
diff --git a/patches/leksah/0.15.0.1/no-hamlet b/patches/leksah/0.15.0.1/no-hamlet
new file mode 100644
index 0000000..4689288
--- /dev/null
+++ b/patches/leksah/0.15.0.1/no-hamlet
@@ -0,0 +1,13 @@
+Index: leksah-0.15.0.1/leksah.cabal
+===================================================================
+--- leksah-0.15.0.1.orig/leksah.cabal	2015-05-31 11:20:40.843538821 +0200
++++ leksah-0.15.0.1/leksah.cabal	2015-05-31 11:20:58.687905277 +0200
+@@ -231,7 +231,7 @@
+       build-depends: webkitgtk3 -any, webkitgtk3-javascriptcore -any
+     else
+       build-depends: webkit -any, webkit-javascriptcore -any
+-    build-depends: jsaddle -any, ghcjs-codemirror -any, hamlet -any, blaze-html -any,
++    build-depends: jsaddle -any, ghcjs-codemirror -any, blaze-html -any,
+                    lens -any, pretty-show >=1.6.3 && <1.7
+     cpp-options: -DWEBKITGTK -DLEKSAH_WITH_CODE_MIRROR
+ 
diff --git a/patches/leksah/0.15.0.1/series b/patches/leksah/0.15.0.1/series
new file mode 100644
index 0000000..576533e
--- /dev/null
+++ b/patches/leksah/0.15.0.1/series
@@ -0,0 +1 @@
+no-hamlet
diff --git a/patches/snap-loader-dynamic/0.10.0.2/new-mtl b/patches/snap-loader-dynamic/0.10.0.2/extend-dependencies
similarity index 66%
rename from patches/snap-loader-dynamic/0.10.0.2/new-mtl
rename to patches/snap-loader-dynamic/0.10.0.2/extend-dependencies
index c37338c..204ad17 100644
--- a/patches/snap-loader-dynamic/0.10.0.2/new-mtl
+++ b/patches/snap-loader-dynamic/0.10.0.2/extend-dependencies
@@ -1,12 +1,14 @@
 Index: snap-loader-dynamic-0.10.0.2/snap-loader-dynamic.cabal
 ===================================================================
---- snap-loader-dynamic-0.10.0.2.orig/snap-loader-dynamic.cabal	2014-09-07 11:27:16.272029779 +0200
-+++ snap-loader-dynamic-0.10.0.2/snap-loader-dynamic.cabal	2014-09-07 11:27:46.500028726 +0200
-@@ -31,7 +31,7 @@
+--- snap-loader-dynamic-0.10.0.2.orig/snap-loader-dynamic.cabal	2015-05-31 11:10:02.672041810 +0200
++++ snap-loader-dynamic-0.10.0.2/snap-loader-dynamic.cabal	2015-05-31 11:10:12.496333745 +0200
+@@ -30,8 +30,8 @@
+ 
    build-depends:
      base              >= 4       && < 5,
-     directory-tree    >= 0.10    && < 0.12,
+-    directory-tree    >= 0.10    && < 0.12,
 -    mtl               >  2.0     && < 2.2,
++    directory-tree    >= 0.10    && < 0.13,
 +    mtl               >  2.0     && < 2.3,
      snap-core         >= 0.9     && < 0.10,
      time              >= 1.1     && < 1.5,
diff --git a/patches/snap-loader-dynamic/0.10.0.2/series b/patches/snap-loader-dynamic/0.10.0.2/series
index 3a41f62..5d3ab77 100644
--- a/patches/snap-loader-dynamic/0.10.0.2/series
+++ b/patches/snap-loader-dynamic/0.10.0.2/series
@@ -1 +1 @@
-new-mtl
+extend-dependencies
diff --git a/patches/tasty/0.10.1.2/regex-tdfa.diff b/patches/tasty/0.10.1.2/regex-tdfa.diff
new file mode 100644
index 0000000..a7ba379
--- /dev/null
+++ b/patches/tasty/0.10.1.2/regex-tdfa.diff
@@ -0,0 +1,13 @@
+Index: tasty-0.10.1/tasty.cabal
+===================================================================
+--- tasty-0.10.1.orig/tasty.cabal	2014-12-21 14:59:19.509001668 +0100
++++ tasty-0.10.1/tasty.cabal	2014-12-21 14:59:29.941201256 +0100
+@@ -53,7 +53,7 @@
+     containers,
+     mtl,
+     tagged >= 0.5,
+-    regex-tdfa-rc >= 1.1.8.2,
++    regex-tdfa >= 1.2,
+     optparse-applicative >= 0.11,
+     deepseq >= 1.3,
+     unbounded-delays >= 0.1,
diff --git a/patches/tasty/0.10.1.2/series b/patches/tasty/0.10.1.2/series
new file mode 100644
index 0000000..f4943a7
--- /dev/null
+++ b/patches/tasty/0.10.1.2/series
@@ -0,0 +1 @@
+regex-tdfa.diff
diff --git a/patches/xmonad/0.11.1/newer-utf8-string b/patches/xmonad/0.11.1/newer-utf8-string
new file mode 100644
index 0000000..f2ad14a
--- /dev/null
+++ b/patches/xmonad/0.11.1/newer-utf8-string
@@ -0,0 +1,13 @@
+Index: xmonad-0.11.1/xmonad.cabal
+===================================================================
+--- xmonad-0.11.1.orig/xmonad.cabal	2015-05-31 11:33:35.774103770 +0200
++++ xmonad-0.11.1/xmonad.cabal	2015-05-31 11:34:17.930848414 +0200
+@@ -58,7 +58,7 @@
+     else
+         build-depends: base < 3
+     build-depends: X11>=1.5 && < 1.7, mtl, unix,
+-                   utf8-string >= 0.3 && < 0.4
++                   utf8-string >= 0.3 && < 1.1
+ 
+     if true
+         ghc-options:        -funbox-strict-fields -Wall
diff --git a/patches/xmonad/0.11.1/series b/patches/xmonad/0.11.1/series
new file mode 100644
index 0000000..7318f6b
--- /dev/null
+++ b/patches/xmonad/0.11.1/series
@@ -0,0 +1 @@
+newer-utf8-string

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git



More information about the Pkg-haskell-commits mailing list