[package-plan] 01/01: "patch" "external" software

Clint Adams clint at moszumanska.debian.org
Thu Oct 27 19:04:28 UTC 2016


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

clint pushed a commit to branch experimental
in repository package-plan.

commit ef9a914a85ff78b696ab9d7cd0a47248b75a8108
Author: Clint Adams <clint at debian.org>
Date:   Thu Oct 27 15:03:55 2016 -0400

    "patch" "external" software
---
 additional-cabals/hedgewars-server-0.1.cabal  |  2 +-
 packages.txt                                  |  7 +++--
 patches/git-annex/6.20161012/newer-persistent | 11 ++++++++
 patches/git-annex/6.20161012/series           |  1 +
 patches/keysafe/0.20161022/newer-ghc          | 37 +++++++++++++++++++++++++++
 patches/keysafe/0.20161022/series             |  1 +
 6 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/additional-cabals/hedgewars-server-0.1.cabal b/additional-cabals/hedgewars-server-0.1.cabal
index 122f2ef..ade6acd 100644
--- a/additional-cabals/hedgewars-server-0.1.cabal
+++ b/additional-cabals/hedgewars-server-0.1.cabal
@@ -26,7 +26,7 @@ Executable hedgewars-server
     random,
     time,
     mtl >= 2,
-    dataenc,
+    sandi,
     hslogger,
     process,
     deepseq,
diff --git a/packages.txt b/packages.txt
index eb49102..4d28011 100644
--- a/packages.txt
+++ b/packages.txt
@@ -266,7 +266,7 @@ ghc-mtl 1.2.1.0
 ghc-paths 0.1.0.9
 ghc-syb-utils 0.2.3
 gio 0.13.3.0
-git-annex 6.20161012 binary key ahead obsolete -f-ConcurrentOutput # BROKEN - GHC8 via esqueleto/persistent
+git-annex 6.20161012 binary key ahead -f-ConcurrentOutput
 github 0.14.1
 github-backup 1.20160522 binary key
 gitit 0.12.1.1 key
@@ -327,7 +327,7 @@ HDBC-postgresql 2.3.2.4 key
 HDBC-session 0.1.1.0
 HDBC-sqlite3 2.3.3.1 key
 hdevtools 0.1.4.1 binary
-hedgewars-server 0.1 meta key obsolete # BROKEN - GHC8 via dataenc (patch available)
+hedgewars-server 0.1 meta key
 hedis 0.9.4 key notest
 heist 1.0.0.0
 heredoc 0.2.0.0
@@ -431,7 +431,7 @@ JuicyPixels 3.2.8
 jwt 0.7.2
 kan-extensions 5.0.1
 keys 3.11
-keysafe 0.20161022 binary=keysafe-bin obsolete # BROKEN - GHC8
+keysafe 0.20161022 binary=keysafe-bin
 knob 0.1.1
 lambdabot 5.1 binary key ignore
 lambdabot-core 5.1 ignore
@@ -453,7 +453,6 @@ lens-action 0.2.0.2
 lens-aeson 1.0.0.5
 lens-family-core 1.2.1
 lhs2tex 1.19 binary key
-libffi 0.1 # not meant to be upload in this state (picca)
 libxml-sax 0.7.5
 lifted-async 0.9.0
 lifted-base 0.2.3.8 notest
diff --git a/patches/git-annex/6.20161012/newer-persistent b/patches/git-annex/6.20161012/newer-persistent
new file mode 100644
index 0000000..a268f07
--- /dev/null
+++ b/patches/git-annex/6.20161012/newer-persistent
@@ -0,0 +1,11 @@
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -362,7 +362,7 @@ Executable git-annex
+    -- Old version needed due to
+    -- https://github.com/prowdsponsor/esqueleto/issues/137
+    -- and also temporarily to make ghc 8 builds work
+-   persistent (< 2.5),
++   persistent >= 2.6 && <2.7,
+    persistent-template,
+    aeson,
+    unordered-containers,
diff --git a/patches/git-annex/6.20161012/series b/patches/git-annex/6.20161012/series
new file mode 100644
index 0000000..2883011
--- /dev/null
+++ b/patches/git-annex/6.20161012/series
@@ -0,0 +1 @@
+newer-persistent
diff --git a/patches/keysafe/0.20161022/newer-ghc b/patches/keysafe/0.20161022/newer-ghc
new file mode 100644
index 0000000..42e7aa6
--- /dev/null
+++ b/patches/keysafe/0.20161022/newer-ghc
@@ -0,0 +1,37 @@
+--- a/keysafe.cabal
++++ b/keysafe.cabal
+@@ -39,27 +39,27 @@ Executable keysafe
+     , random == 1.1.*
+     , secret-sharing == 1.0.*
+     , raaz == 0.0.2
+-    , time == 1.5.*
++    , time >= 1.5 && < 1.7
+     , containers == 0.5.*
+-    , binary == 0.7.*
++    , binary >= 0.7 && < 0.9
+     , text == 1.2.*
+     , utf8-string == 1.0.*
+     , unix == 2.7.*
+     , filepath == 1.4.*
+     , split == 0.2.*
+     , directory == 1.2.*
+-    , process == 1.2.*
++    , process >= 1.2 && < 1.5
+     , optparse-applicative == 0.12.*
+     , readline == 1.0.*
+     , zxcvbn-c == 1.0.*
+-    , servant == 0.7.*
+-    , servant-server == 0.7.*
+-    , servant-client == 0.7.*
++    , servant >= 0.7 && < 0.9
++    , servant-server >= 0.7 && < 0.9
++    , servant-client >= 0.7 && < 0.9
+     , aeson == 0.11.*
+     , wai == 3.2.*
+     , warp == 3.2.*
+     , http-client == 0.4.*
+-    , transformers == 0.4.*
++    , transformers >= 0.4 && < 0.6
+     , stm == 2.4.*
+     , socks == 0.5.*
+     , network == 2.6.*
diff --git a/patches/keysafe/0.20161022/series b/patches/keysafe/0.20161022/series
new file mode 100644
index 0000000..658e5d7
--- /dev/null
+++ b/patches/keysafe/0.20161022/series
@@ -0,0 +1 @@
+newer-ghc

-- 
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